From f9df6977a160249a051866d4458e5521d68abb78 Mon Sep 17 00:00:00 2001 From: "METANEOCORTEX\\Kotti" Date: Wed, 13 Sep 2023 17:36:02 +0200 Subject: [PATCH] +upd: Scintilla v5.3.6 +chg: "Dot matches all" -> "Dot matches line-breaks" (like NP++) --- language/np3_de_de/dialogs_de_de.rc | 4 +- language/np3_en_us/dialogs_en_us.rc | 4 +- scintilla/cppcheck.suppress | 42 +++++--- scintilla/doc/ScintillaDoc.html | 152 +++++++++++++-------------- scintilla/doc/ScintillaDownload.html | 10 +- scintilla/doc/ScintillaHistory.html | 43 +++++++- scintilla/doc/index.html | 9 +- scintilla/src/CellBuffer.cxx | 2 +- scintilla/src/ChangeHistory.cxx | 2 +- scintilla/src/Editor.cxx | 6 +- scintilla/src/PerLine.cxx | 2 +- scintilla/version.txt | 2 +- scintilla/win32/HanjaDic.cxx | 2 +- scintilla/win32/PlatWin.cxx | 134 +++++++++++++++-------- scintilla/win32/PlatWin.h | 2 +- scintilla/win32/ScintRes.rc | 4 +- scintilla/win32/ScintillaWin.cxx | 23 ++-- scintilla/win32/scintilla.mak | 2 +- src/Version.h | 10 +- 19 files changed, 285 insertions(+), 170 deletions(-) diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index 32d485cf1..ffb284f07 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -96,7 +96,7 @@ BEGIN CONTROL "Nur Wort-Anf&änge",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 CONTROL "&Transformiere Backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,100,10 CONTROL "&Regulärer Ausdruck",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 - CONTROL "&Punkt ersetzt Alle",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,70,10 + CONTROL "&Punkt ersetzt Zeilenumbruch",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,100,10 CONTROL "&Kein Wrap-Around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 CONTROL "Schließe nach Fund",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,75,10 CONTROL "&Markiere Auftreten",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,75,10 @@ -130,7 +130,7 @@ BEGIN CONTROL "Nur Wort-Anf&änge",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 CONTROL "&Transformiere Backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,100,10 CONTROL "&Regulärer Ausdruck",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,96,10 - CONTROL "&Punkt ersetzt Alle",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,70,10 + CONTROL "&Punkt ersetzt Zeilenumbruch",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,100,10 CONTROL "&Kein Wrap-Around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 CONTROL "Schließe nach Fund",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10 CONTROL "&Markiere Auftreten",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10 diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 41849b07e..c63c04e1e 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -96,7 +96,7 @@ BEGIN CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10 CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 - CONTROL "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10 + CONTROL "Dot &matches line-breaks",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,90,10 CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 CONTROL "C&lose after find",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10 CONTROL "Mar&k Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10 @@ -130,7 +130,7 @@ BEGIN CONTROL "Match &beginning of word only",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 CONTROL "&Transform backslashes",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 CONTROL "Regular &expression search",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10 - CONTROL "Dot &matches all",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10 + CONTROL "Dot &matches line-breaks",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,90,10 CONTROL "&Don't wrap around",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 CONTROL "C&lose after replace",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10 CONTROL "Mar&k Occurrences",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10 diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress index 4d57ed25c..cbae0d2e9 100644 --- a/scintilla/cppcheck.suppress +++ b/scintilla/cppcheck.suppress @@ -1,5 +1,6 @@ // File to suppress cppcheck warnings for files that will not be fixed. // Does not suppress warnings where an additional occurrence of the warning may be of interest. +// Configured for cppcheck 2.11 // Coding style is to use assignments in constructor when there are many // members to initialize or the initialization is complex or has comments. @@ -13,6 +14,12 @@ useStlAlgorithm // Written with variable for consistency knownArgument:scintilla/src/SparseVector.h +// cppcheck 2.11 can't find system headers on Win32. +missingIncludeSystem + +// cppcheck 2.11 limits checking of complex functions unless --check-level=exhaustive +checkLevelNormal:scintilla/src/Editor.cxx + // The cast converts from 'unsigned char ' to 'char' so isn't unused. // Redundant code: Found unused cast of expression 'leadByte' constStatement:scintilla/src/Document.cxx @@ -30,31 +37,42 @@ unusedFunction:scintilla/win32/ScintillaDLL.cxx unusedFunction:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp // Doesn't understand changing dropWentOutside in Editor -knownConditionTrueFalse:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp knownConditionTrueFalse:scintilla/win32/ScintillaWin.cxx +// GetData is implementing interface so shouldn't add const +constParameterPointer:scintilla/win32/ScintillaWin.cxx + +// Doesn't handle intptr_t (long long) being signed +knownConditionTrueFalse:scintilla/src/Editor.cxx +knownConditionTrueFalse:scintilla/src/EditView.cxx + +// cppcheck seems to believe that unique_ptr::get returns void* instead of T** +arithOperationsOnVoidPointer:scintilla/src/PerLine.cxx +arithOperationsOnVoidPointer:scintilla/src/PositionCache.cxx + +// Cppcheck wrongly assumes string_view::remove_prefix can not empty the view +knownConditionTrueFalse:scintilla/src/CallTip.cxx + // G_DEFINE_TYPE is too complex to pass to cppcheck unknownMacro:scintilla/gtk/PlatGTK.cxx // maskSmooth set depending on preprocessor allowing Wayland definition badBitmaskCheck:scintilla/gtk/ScintillaGTK.cxx +// Changing events to const pointers changes signature and would require casts when hooking up +constParameterPointer:scintilla/gtk/ScintillaGTK.cxx +constParameterCallback:scintilla/gtk/ScintillaGTK.cxx + // Difficult to test accessibility so don't change -constVariable:scintilla/gtk/ScintillaGTKAccessible.cxx - -// Have no way of testing ScintillaEdit so don't fix even simple warnings -cstyleCast:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp -shadowFunction:scintilla/qt/ScintillaEdit/ScintillaEdit.cpp - -// cppcheck fails emit from Qt -shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp -shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp +constParameterPointer:scintilla/gtk/ScintillaGTKAccessible.cxx +constVariableReference:scintilla/gtk/ScintillaGTKAccessible.cxx +constVariablePointer:scintilla/gtk/ScintillaGTKAccessible.cxx // moc_ files show #error as they are not built with standard context preprocessorErrorDirective:scintilla/qt/*.cpp -// moc_ files are not understood by cppcheck -noValidConfiguration +// Doesn't understand Qt slots macro +unknownMacro:scintilla/qt/ScintillaEditBase/*.h // The performance cost of by-value passing is often small and using a reference decreases // code legibility. diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index b445891b9..ae1e5a942 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -1347,7 +1347,7 @@ struct Sci_TextToFindFull { Coalescing treats coalescible container actions as transparent so will still only group together insertions that look like typing or deletions that look like multiple uses of the Backspace or Delete keys.

- +

Change history

Scintilla can display document changes (modified, saved, ...) in the margin or in the text.

@@ -3366,114 +3366,114 @@ struct Sci_TextToFindFull { SC_CHARSET_ANSI - ✓ - ✓ - ✓ (8859-1) + ✓ + ✓ + ✓ (8859-1) SC_CHARSET_ARABIC - ✓ + ✓ - ✓ + ✓ SC_CHARSET_BALTIC - ✓ + ✓ - ✓ + ✓ SC_CHARSET_CHINESEBIG5 - ✓ + ✓ - ✓ + ✓ SC_CHARSET_DEFAULT - ✓ - ✓ (8859-1) - ✓ (8859-1) + ✓ + ✓ (8859-1) + ✓ (8859-1) SC_CHARSET_EASTEUROPE - ✓ - ✓ - ✓ + ✓ + ✓ + ✓ SC_CHARSET_GB2312 - ✓ - ✓ - ✓ + ✓ + ✓ + ✓ SC_CHARSET_GREEK - ✓ + ✓ - ✓ + ✓ SC_CHARSET_HANGUL - ✓ - ✓ - ✓ + ✓ + ✓ + ✓ SC_CHARSET_HEBREW - ✓ + ✓ - ✓ + ✓ SC_CHARSET_JOHAB - ✓ + ✓ - ✓ + ✓ SC_CHARSET_MAC - ✓ + ✓ - ✓ + ✓ SC_CHARSET_OEM - ✓ + ✓ - ✓ + ✓ SC_CHARSET_RUSSIAN - ✓ (cp1251) - ✓ (koi8-r) - ✓ (cp1251) + ✓ (cp1251) + ✓ (koi8-r) + ✓ (cp1251) SC_CHARSET_SHIFTJIS - ✓ - ✓ - ✓ + ✓ + ✓ + ✓ SC_CHARSET_SYMBOL - ✓ + ✓ - ✓ + ✓ SC_CHARSET_THAI - ✓ + ✓ - ✓ + ✓ SC_CHARSET_TURKISH - ✓ + ✓ - ✓ + ✓ SC_CHARSET_VIETNAMESE - ✓ + ✓ - ✓ + ✓ SC_CHARSET_OEM866 - ✓ (cp866) + ✓ (cp866) SC_CHARSET_CYRILLIC - ✓ (cp1251) - ✓ (cp1251) + ✓ (cp1251) + ✓ (cp1251) SC_CHARSET_8859_15 - ✓ - ✓ + ✓ + ✓

SCI_STYLESETCASE(int style, int caseVisible)
@@ -4882,12 +4882,12 @@ struct Sci_TextToFindFull { rectangular and multiple selection, with IME interactions such as retrieve-surrounding or reconversion feature.

- + - + @@ -4895,17 +4895,17 @@ struct Sci_TextToFindFull { - - - - + + + + - - - - + + + +
IME input method support (O=present, X=absent)IME input method support
IME input method WindowsGtkGTK Qt macOS
SC_IME_WINDOWEDOOXX✓✓
SC_IME_INLINEOOOO✓✓✓✓
@@ -4917,7 +4917,7 @@ struct Sci_TextToFindFull { IME interaction Windows - Gtk + GTK Qt macOS @@ -4925,24 +4925,24 @@ struct Sci_TextToFindFull { Retrieve Surrounding - O - O - O - O + ✓ + ✓ + ✓ + ✓ Reconversion - O - O - O - O + ✓ + ✓ + ✓ + ✓ Delete Surrounding - O - O - X - O + ✓ + ✓ + ✓ + ✓ @@ -4979,7 +4979,7 @@ struct Sci_TextToFindFull {

Opaque selection drawing (SCI_SETSELECTIONLAYER(SC_LAYER_BASE)) is not supported in bidirectional mode. - Use SC_LAYER_UNDER_TEXT or SC_LAYER_OVER_TEXT instead. + Use SC_LAYER_UNDER_TEXT or SC_LAYER_OVER_TEXT instead.

@@ -9683,7 +9683,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next 6 - There was only a single choice in the list and 'choose single' mode was active as set by + There was only a single choice in the list and 'choose single' mode was active as set by SCI_AUTOCSETCHOOSESINGLE. ch is 0. diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index 921df0984..4a14ce217 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@ @@ -42,7 +42,7 @@ containing very few restrictions.

- Release 5.3.5 + Release 5.3.6

Source Code @@ -50,8 +50,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1.4M) commonly used on Windows
    • -
  • tgz format (1.3M) commonly used on Linux and compatible operating systems
    • +
  • zip format (1.4M) commonly used on Windows
    • +
  • tgz format (1.3M) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index f60eb3933..975dc8d04 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -578,15 +578,44 @@

+ +
- + Windows   - + GTK/Linux   Enrico Tröger
Chengzhi LiGary JamesTsuyoshi Miyake

Releases

+

+ Release 5.3.7 +

+

Release 5.3.6