Update: Scintilla 5.3.5 Lexilla 5.2.5

update to Scinitlla Release 5.3.5 (https://www.scintilla.org/scintilla535.zip) Released 31 May 2023. On Win32, implement IME context sensitivity with IMR_DOCUMENTFEED. Feature #1310. On Win32 remove dependence on MSIMG32.DLL by replacing AlphaBlend by GdiAlphaBlend. Bug #1923. On Qt, stop movement of IME candidate box. On Qt, report correct caret position within paragraph for IME retrieve surrounding text. On Qt for Cocoa, fix crash in entry of multi-character strings with IME. and Lexilla Release 5.2.5 (https://www.scintilla.org/lexilla525.zip) Released 31 May 2023. Add CharacterSetArray constructor without setBase initial argument for common case where this is setNone and the initialSet argument completely defines the characters. This shortens and clarifies use of CharacterSetArray. Bash: implement highlighting inside quoted elements and here-docs. Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks, lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc. Issue #154, Issue #153, Feature #1033. Bash: add property lexer.bash.command.substitution to choose how to style command substitutions. 0 → SCE_SH_BACKTICKS; 1 → surrounding "$(" and ")" as operators and contents styled as bash code; 2 → use distinct styles (base style + 64) for contents. Choice (2) is a provisional feature and details may change before it is finalized. Issue #153. Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}. Issue #154. Bash: fix single character special parameters like $? by limiting style. Issue #154. Bash: treat "$$" as special parameter and end scalars before "$". Issue #154. Bash: treat "<<" in arithmetic contexts as left bitwise shift operator instead of here-doc. Issue #137. Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed. Issue #148. F#: Lex interpolated verbatim strings as verbatim. Issue #156. VB: allow multiline strings when lexer.vb.strings.multiline set. Issue #151. Close #13729
notepad-plus-plus · Jun 2, 2023 · b39ca37 · b39ca37
1 parent 043bd4f
commit b39ca37
Show file tree

Hide file tree

Showing 95 changed files with 2,036 additions and 845 deletions.
diff --git a/...tilla.original.forUpdating/lexilla524.zip → ...tilla.original.forUpdating/lexilla525.zip b/...tilla.original.forUpdating/lexilla524.zip → ...tilla.original.forUpdating/lexilla525.zip
diff --git a/...lla.original.forUpdating/scintilla534.zip → ...lla.original.forUpdating/scintilla535.zip b/...lla.original.forUpdating/scintilla534.zip → ...lla.original.forUpdating/scintilla535.zip
diff --git a/lexilla/cppcheck.suppress b/lexilla/cppcheck.suppress
@@ -29,7 +29,6 @@ shadowVariable:lexilla/lexers/LexAU3.cxx
 constParameter:lexilla/lexers/LexBaan.cxx
 unreadVariable:lexilla/lexers/LexBaan.cxx
 constParameter:lexilla/lexers/LexBash.cxx
-uninitMemberVar:lexilla/lexers/LexBash.cxx
 variableScope:lexilla/lexers/LexBash.cxx
 variableScope:lexilla/lexers/LexCmake.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
@@ -46,7 +45,6 @@ variableScope:lexilla/lexers/LexErlang.cxx
 knownConditionTrueFalse:lexilla/lexers/LexEScript.cxx
 constParameter:lexilla/lexers/LexFortran.cxx
 redundantContinue:lexilla/lexers/LexFortran.cxx
-redundantCondition:lexilla/lexers/LexFSharp.cxx
 knownConditionTrueFalse:lexilla/lexers/LexFSharp.cxx
 constParameter:lexilla/lexers/LexGDScript.cxx
 variableScope:lexilla/lexers/LexGui4Cli.cxx

diff --git a/lexilla/doc/Lexilla.html b/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20230313" />
+    <meta name="Date.Modified" content="20230531" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.2.4<br />
-           Site last modified March 13 2023</font>
+          <font color="#FFCC99" size="3">Release version 5.2.5<br />
+           Site last modified May 31 2023</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,13 +77,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.2.5 improves Bash, Batch, F#, and VB.</li>
       <li>Version 5.2.4 improves C++ and GDScript.</li>
       <li>Version 5.2.3 improves Makefile, Ruby, and YAML.</li>
       <li>Version 5.2.2 improves C++, Matlab, Modula-3, Python, and X12.</li>
       <li>Version 5.2.1 improves Batch, F#, Markdown, and PowerShell.</li>
       <li>Version 5.2.0 improves PowerShell and R.</li>
-      <li>Version 5.1.9 improves Julia and Properties.</li>
-      <li>Version 5.1.8 improves F#, MS SQL, PowerShell, and Visual Prolog.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

diff --git a/lexilla/doc/LexillaDownload.html b/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla524.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla525.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla524.tgz">
+	<a href="https://www.scintilla.org/lexilla525.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.2.4
+       Release 5.2.5
     </h3>
     <h4>
        Source Code
     </h4>
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla524.zip">zip format</a> (1.2M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla524.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla525.zip">zip format</a> (1.2M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla525.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>

diff --git a/lexilla/doc/LexillaHistory.html b/lexilla/doc/LexillaHistory.html
@@ -585,6 +585,63 @@ <h2>Contributors</h2>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla525.zip">Release 5.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 May 2023.
+	</li>
+	<li>
+	Add CharacterSetArray constructor without setBase initial argument for common case
+	where this is setNone and the initialSet argument completely defines the characters.
+	This shortens and clarifies use of CharacterSetArray.
+	</li>
+	<li>
+	Bash: implement highlighting inside quoted elements and here-docs.
+	Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks,
+	lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/153">Issue #153</a>,
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1033/">Feature #1033</a>.
+	</li>
+	<li>
+	Bash: add property lexer.bash.command.substitution to choose how to style command substitutions.
+	0 &rarr; SCE_SH_BACKTICKS;
+	1 &rarr; surrounding "$(" and ")" as operators and contents styled as bash code;
+	2 &rarr; use distinct styles (base style + 64) for contents.
+	Choice (2) is a provisional feature and details may change before it is finalized.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/153">Issue #153</a>.
+	</li>
+	<li>
+	Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: fix single character special parameters like $? by limiting style.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: treat "$$" as special parameter and end scalars before "$".
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/154">Issue #154</a>.
+	</li>
+	<li>
+	Bash: treat "&lt;&lt;" in arithmetic contexts as left bitwise shift operator instead of here-doc.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/137">Issue #137</a>.
+	</li>
+	<li>
+	Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/148">Issue #148</a>.
+	</li>
+	<li>
+	F#: Lex interpolated verbatim strings as verbatim.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/156">Issue #156</a>.
+	</li>
+	<li>
+	VB: allow multiline strings when lexer.vb.strings.multiline set.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/151">Issue #151</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla524.zip">Release 5.2.4</a>
     </h3>

diff --git a/lexilla/include/LexicalStyles.iface b/lexilla/include/LexicalStyles.iface
@@ -602,6 +602,7 @@ val SCE_BAT_HIDE=4
 val SCE_BAT_COMMAND=5
 val SCE_BAT_IDENTIFIER=6
 val SCE_BAT_OPERATOR=7
+val SCE_BAT_AFTER_LABEL=8
 # Lexical states for SCLEX_TCMD
 lex TCMD=SCLEX_TCMD SCE_TCMD_
 val SCE_TCMD_DEFAULT=0

diff --git a/lexilla/include/SciLexer.h b/lexilla/include/SciLexer.h
@@ -676,6 +676,7 @@
 #define SCE_BAT_COMMAND 5
 #define SCE_BAT_IDENTIFIER 6
 #define SCE_BAT_OPERATOR 7
+#define SCE_BAT_AFTER_LABEL 8
 #define SCE_TCMD_DEFAULT 0
 #define SCE_TCMD_COMMENT 1
 #define SCE_TCMD_WORD 2