Skip to content

Commit

Permalink
update to Scintilla 5.3.6 and Lexilla 5.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
stefankueng committed Jul 26, 2023
1 parent ee010de commit 0631c3a
Show file tree
Hide file tree
Showing 21 changed files with 311 additions and 185 deletions.
2 changes: 1 addition & 1 deletion ext/lexilla
Submodule lexilla updated 71 files
+1 −0 .gitattributes
+75 −40 cppcheck.suppress
+4 −5 doc/Lexilla.html
+10 −10 doc/LexillaDoc.html
+5 −5 doc/LexillaDownload.html
+74 −0 doc/LexillaHistory.html
+12 −9 include/LexicalStyles.iface
+11 −8 include/SciLexer.h
+72 −43 lexers/LexBash.cxx
+1 −1 lexers/LexCPP.cxx
+1 −0 lexers/LexCoffeeScript.cxx
+21 −0 lexers/LexErrorList.cxx
+53 −46 lexers/LexHTML.cxx
+38 −20 lexers/LexMatlab.cxx
+1 −0 lexers/LexNimrod.cxx
+4 −0 lexers/LexNsis.cxx
+2 −0 lexers/LexPS.cxx
+1 −1 lexers/LexRust.cxx
+4 −2 lexers/LexSQL.cxx
+407 −243 lexers/LexVisualProlog.cxx
+3 −0 lexers/LexYAML.cxx
+1 −1 lexlib/CharacterSet.h
+1 −1 lexlib/OptionSet.h
+1 −1 src/Lexilla/Info.plist
+2 −2 src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+2 −2 src/LexillaVersion.rc
+1 −1 test/examples/bash/AllStyles.bsh.styled
+7 −0 test/examples/bash/Issue180.bsh
+8 −0 test/examples/bash/Issue180.bsh.folded
+7 −0 test/examples/bash/Issue180.bsh.styled
+7 −0 test/examples/bash/Issue182.bsh
+8 −0 test/examples/bash/Issue182.bsh.folded
+7 −0 test/examples/bash/Issue182.bsh.styled
+11 −0 test/examples/bash/Issue184.bsh
+12 −0 test/examples/bash/Issue184.bsh.folded
+11 −0 test/examples/bash/Issue184.bsh.styled
+11 −0 test/examples/bash/Issue184Copy.bsh
+12 −0 test/examples/bash/Issue184Copy.bsh.folded
+11 −0 test/examples/bash/Issue184Copy.bsh.styled
+3 −3 test/examples/bash/Nested.bsh.styled
+3 −3 test/examples/bash/NestedRich.bsh.styled
+6 −6 test/examples/bash/NestedStyledInside.bsh.styled
+16 −1 test/examples/bash/SciTE.properties
+3 −0 test/examples/bash/x.bsh
+3 −0 test/examples/bash/x.bsh.folded
+7 −4 test/examples/bash/x.bsh.styled
+4 −0 test/examples/errorlist/AllStyles.err
+4 −0 test/examples/errorlist/AllStyles.err.folded
+4 −0 test/examples/errorlist/AllStyles.err.styled
+3 −3 test/examples/hypertext/SciTE.properties
+24 −0 test/examples/hypertext/ServerBasic.aspx
+25 −0 test/examples/hypertext/ServerBasic.aspx.folded
+24 −0 test/examples/hypertext/ServerBasic.aspx.styled
+19 −0 test/examples/hypertext/ServerJavaScript.aspx
+20 −0 test/examples/hypertext/ServerJavaScript.aspx.folded
+19 −0 test/examples/hypertext/ServerJavaScript.aspx.styled
+49 −1 test/examples/matlab/ArgumentsBlock.m.matlab
+50 −1 test/examples/matlab/ArgumentsBlock.m.matlab.folded
+49 −1 test/examples/matlab/ArgumentsBlock.m.matlab.styled
+19 −11 test/examples/visualprolog/AllStyles.pl
+19 −11 test/examples/visualprolog/AllStyles.pl.folded
+25 −17 test/examples/visualprolog/AllStyles.pl.styled
+32 −14 test/examples/visualprolog/AllStyles.pro
+32 −14 test/examples/visualprolog/AllStyles.pro.folded
+35 −17 test/examples/visualprolog/AllStyles.pro.styled
+1 −1 test/unit/testCharacterSet.cxx
+8 −5 test/unit/testLexerSimple.cxx
+126 −0 test/unit/testOptionSet.cxx
+7 −6 test/unit/testPropSetSimple.cxx
+1 −3 test/unit/testWordList.cxx
+1 −1 version.txt
4 changes: 2 additions & 2 deletions ext/scintilla/.hg_archival.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repo: bdf8c3ef2fb01ea24578e726337888e706d10b92
node: 524df785ef39bd246adc70e957c415c3d60a0bb3
node: 61ad270164c7a555c15cef9d959ca06d08b81d7b
branch: default
latesttag: rel-5-3-5
latesttag: rel-5-3-6
latesttagdistance: 1
changessincelatesttag: 1
1 change: 1 addition & 0 deletions ext/scintilla/.hgtags
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,4 @@ cd20da25b81f68b300143828ab94887448dac385 rel-5-3-2
da729553c76b8769b7400a381b1785cee50216a1 rel-5-3-3
10f4ff8763bc0b2c862bc1732fe940472e07cc5a rel-5-3-4
1c5360ebe7b0c824c535d0d10a788be573b3adc3 rel-5-3-5
57bcb62d635cc6bd2ef8c295fc2a53c5d86a433f rel-5-3-6
42 changes: 30 additions & 12 deletions ext/scintilla/cppcheck.suppress
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand All @@ -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<T *[]>::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

// 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
// Changing events to const pointers changes signature and would require casts when hooking up
constParameterPointer:scintilla/gtk/ScintillaGTK.cxx
constParameterCallback:scintilla/gtk/ScintillaGTK.cxx

// cppcheck fails emit from Qt
shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaQt.cpp
shadowFunction:scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
// Difficult to test accessibility so don't change
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.
Expand Down
152 changes: 76 additions & 76 deletions ext/scintilla/doc/ScintillaDoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ <h2 id="UndoAndRedo">Undo and Redo</h2>
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.
</p>

<h2 id="ChangeHistory">Change history</h2>

<p>Scintilla can display document changes (modified, saved, ...) in the margin or in the text.</p>
Expand Down Expand Up @@ -3366,114 +3366,114 @@ <h2 id="StyleDefinition">Style definition</h2>
<tbody>
<tr>
<td><code>SC_CHARSET_ANSI</code></td>
<td>&#10003;</td>
<td>&#10003;</td>
<td>&#10003; (8859-1)</td></tr>
<td>&check;</td>
<td>&check;</td>
<td>&check; (8859-1)</td></tr>
<tr>
<td><code>SC_CHARSET_ARABIC</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_BALTIC</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_CHINESEBIG5</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_DEFAULT</code></td>
<td>&#10003;</td>
<td>&#10003; (8859-1)</td>
<td>&#10003; (8859-1)</td></tr>
<td>&check;</td>
<td>&check; (8859-1)</td>
<td>&check; (8859-1)</td></tr>
<tr>
<td><code>SC_CHARSET_EASTEUROPE</code></td>
<td>&#10003;</td>
<td>&#10003;</td>
<td>&#10003;</td></tr>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_GB2312</code></td>
<td>&#10003;</td>
<td>&#10003;</td>
<td>&#10003;</td></tr>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_GREEK</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_HANGUL</code></td>
<td>&#10003;</td>
<td>&#10003;</td>
<td>&#10003;</td></tr>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_HEBREW</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_JOHAB</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_MAC</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_OEM</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_RUSSIAN</code></td>
<td>&#10003; (cp1251)</td>
<td>&#10003; (koi8-r)</td>
<td>&#10003; (cp1251)</td></tr>
<td>&check; (cp1251)</td>
<td>&check; (koi8-r)</td>
<td>&check; (cp1251)</td></tr>
<tr>
<td><code>SC_CHARSET_SHIFTJIS</code></td>
<td>&#10003;</td>
<td>&#10003;</td>
<td>&#10003;</td></tr>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_SYMBOL</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_THAI</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_TURKISH</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_VIETNAMESE</code></td>
<td>&#10003;</td>
<td>&check;</td>
<td></td>
<td>&#10003;</td></tr>
<td>&check;</td></tr>
<tr>
<td><code>SC_CHARSET_OEM866</code></td>
<td></td>
<td>&#10003; (cp866)</td>
<td>&check; (cp866)</td>
<td></td></tr>
<tr>
<td><code>SC_CHARSET_CYRILLIC</code></td>
<td></td>
<td>&#10003; (cp1251)</td>
<td>&#10003; (cp1251)</td></tr>
<td>&check; (cp1251)</td>
<td>&check; (cp1251)</td></tr>
<tr>
<td><code>SC_CHARSET_8859_15</code></td>
<td></td>
<td>&#10003;</td>
<td>&#10003;</td></tr>
<td>&check;</td>
<td>&check;</td></tr>
</tbody></table>

<p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int style, int caseVisible)</b><br />
Expand Down Expand Up @@ -4882,30 +4882,30 @@ <h2 id="OtherSettings">Other settings</h2>
rectangular and multiple selection, with IME interactions such as retrieve-surrounding or reconversion feature.</p>

<table class="standard" summary="IME input method">
<caption>IME input method support (O=present, X=absent)</caption>
<caption>IME input method support</caption>
<thead align="left">
<tr>
<th>IME input method</th>
<th>Windows</th>
<th>Gtk</th>
<th>GTK</th>
<th>Qt</th>
<th>macOS</th>
</tr>
</thead>
<tbody valign="top">
<tr>
<th align="left"><code>SC_IME_WINDOWED</code></th>
<td>O</td>
<td>O</td>
<td>X</td>
<td>X</td>
<td>&check;</td>
<td>&check;</td>
<td> </td>
<td> </td>
</tr>
<tr>
<th align="left"><code>SC_IME_INLINE</code></th>
<td>O</td>
<td>O</td>
<td>O</td>
<td>O</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
</tr>
</tbody>
</table>
Expand All @@ -4917,32 +4917,32 @@ <h2 id="OtherSettings">Other settings</h2>
<tr>
<th>IME interaction</th>
<th>Windows</th>
<th>Gtk</th>
<th>GTK</th>
<th>Qt</th>
<th>macOS</th>
</tr>
</thead>
<tbody valign="top">
<tr>
<th align="left">Retrieve Surrounding</th>
<td>O</td>
<td>O</td>
<td>O</td>
<td>O</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
</tr>
<tr>
<th align="left">Reconversion</th>
<td>O</td>
<td>O</td>
<td>O</td>
<td>O</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
</tr>
<tr>
<th align="left">Delete Surrounding</th>
<td>O</td>
<td>O</td>
<td>X</td>
<td>O</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
<td>&check;</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -4979,7 +4979,7 @@ <h2 id="OtherSettings">Other settings</h2>
</p>
<p>Opaque selection drawing (<a class="seealso" href="#SCI_SETSELECTIONLAYER">SCI_SETSELECTIONLAYER(SC_LAYER_BASE)</a>)
is not supported in bidirectional mode.
Use <code>SC_LAYER_UNDER_TEXT</code> or <code>SC_LAYER_OVER_TEXT</code> instead.
Use <code>SC_LAYER_UNDER_TEXT</code> or <code>SC_LAYER_OVER_TEXT</code> instead.
</p>
</div>

Expand Down Expand Up @@ -9683,7 +9683,7 @@ <h2 id="Notifications">Notifications</h2>

<td align="center">6</td>

<td>There was only a single choice in the list and 'choose single' mode was active as set by
<td>There was only a single choice in the list and 'choose single' mode was active as set by
<code>
<a class="seealso" href="#SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE</a></code>. ch is 0.</td>

Expand Down
Loading

0 comments on commit 0631c3a

Please sign in to comment.