Update to scintilla 5.5.0 & Lexilla 5.3.2

Sintilla Release 5.5.0 (https://www.scintilla.org/scintilla550.zip) Released 23 April 2024. Add elements for inactive additional selections SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT and SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK. When not set these default to SC_ELEMENT_SELECTION_INACTIVE_TEXT and SC_ELEMENT_SELECTION_INACTIVE_BACK. Bug #2417. On Cocoa, avoid use of NSUserDefaults which will soon require justification when used in applications on the App Store. Fix Win32 IME crash in windowed mode. Bug #2433. Scale reverse arrow cursor for margins to match other cursors when user changes pointer size. Bug #2321. Lexilla Release 5.3.2 (https://www.scintilla.org/lexilla532.zip) Released 23 April 2024. COBOL: Stop string literal continuing over line end. Issue #229. COBOL: Stop doc comment assigning different styles to \r and \n at line end. Issue #229. COBOL: Recognize keywords that start with 'V'. Issue #230. COBOL: Recognize comments after tag or that start with '/'. Issue #231. HTML: Implement substyles for tags, attributes, and identifiers SCE_H_TAG, SCE_H_ATTRIBUTE, SCE_HJ_WORD, SCE_HJA_WORD, SCE_HB_WORD, SCE_HP_WORD, SCE_HPHP_WORD. HTML: Implement context-sensitive attributes. "tag.attribute" matches "attribute" only inside "tag". HTML: Match standard handling of comments. Issue #232. Lua: Implement substyles for identifiers SCE_LUA_IDENTIFIER. Ruby: Allow non-ASCII here-doc delimiters. Issue #234. Ruby: Allow modifier if, unless, while and until after heredoc delimiter. Issue #236. Rust: Recognize raw identifiers. Issue #239, Pull request #240. Close #15042
notepad-plus-plus · Apr 30, 2024 · 881e8c2 · 881e8c2
1 parent c823ca8
commit 881e8c2
Show file tree

Hide file tree

Showing 119 changed files with 1,916 additions and 765 deletions.
diff --git a/...tilla.original.forUpdating/lexilla531.zip → ...tilla.original.forUpdating/lexilla532.zip b/...tilla.original.forUpdating/lexilla531.zip → ...tilla.original.forUpdating/lexilla532.zip
diff --git a/...lla.original.forUpdating/scintilla543.zip → ...lla.original.forUpdating/scintilla550.zip b/...lla.original.forUpdating/scintilla543.zip → ...lla.original.forUpdating/scintilla550.zip
diff --git a/lexilla/.gitattributes b/lexilla/.gitattributes
@@ -30,6 +30,7 @@
 **.php text
 **.vb text
 **.asm text
+**.cob text
 **.cmake text
 **.d text
 **.diff text

diff --git a/lexilla/.github/workflows/build-check-macos.yml b/lexilla/.github/workflows/build-check-macos.yml
@@ -12,7 +12,7 @@ jobs:
                 cpp_compiler: [clang++]
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install Scintilla source
           run: |
               (cd .. && wget --no-verbose https://www.scintilla.org/scintilla500.zip)
@@ -21,7 +21,7 @@ jobs:
           run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test)
         - name: Build Lexilla
           run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}})
-        - uses: actions/upload-artifact@v3
+        - uses: actions/upload-artifact@v4
           with:
               name: liblexilla.dylib
               path: bin/liblexilla.dylib

diff --git a/lexilla/.github/workflows/build-check-win32.yml b/lexilla/.github/workflows/build-check-win32.yml
@@ -8,7 +8,7 @@ jobs:
         runs-on: windows-latest
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Preparing nmake
           uses: ilammy/msvc-dev-cmd@v1
           with:
@@ -31,7 +31,7 @@ jobs:
               cd src
               nmake -f lexilla.mak DEBUG=1
               cd ..
-        - uses: actions/upload-artifact@v3
+        - uses: actions/upload-artifact@v4
           with:
               name: lexilla.dll
               path: bin/lexilla.dll

diff --git a/lexilla/.github/workflows/build-check.yml b/lexilla/.github/workflows/build-check.yml
@@ -12,7 +12,7 @@ jobs:
                 cpp_compiler: [g++, clang++]
 
         steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Install Scintilla source
           run: |
               (cd .. && wget --no-verbose https://www.scintilla.org/scintilla500.zip)
@@ -21,10 +21,11 @@ jobs:
           run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test)
         - name: Build Lexilla
           run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}})
-        - uses: actions/upload-artifact@v3
+        - uses: actions/upload-artifact@v4
           with:
-              name: liblexilla.so
+              name: liblexilla-${{matrix.cpp_compiler}}.so
               path: bin/liblexilla.so
+              overwrite: true
         - name: Test lexing and folding
           run: (cd test && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test)
         - name: CheckLexilla C Example

diff --git a/lexilla/cppcheck.suppress b/lexilla/cppcheck.suppress
@@ -28,9 +28,6 @@ returnDanglingLifetime:lexilla/access/LexillaAccess.cxx
 // cppcheck seems to believe that unique_ptr<char *[]>::get returns void* instead of char**
 arithOperationsOnVoidPointer:lexilla/lexlib/WordList.cxx
 
-// This could be fixed but it should be rewritten to use string_view which doesn't have resize
-uselessCallsSubstr:lexilla/lexers/LexCPP.cxx
-
 // cppcheck 2.11 limits checking of complex functions unless --check-level=exhaustive but that
 // only finds one false issue in LexRuby
 checkLevelNormal:lexilla/lexers/LexBash.cxx
@@ -90,7 +87,6 @@ variableScope:lexilla/lexers/LexGui4Cli.cxx
 constParameterReference:lexilla/lexers/LexHaskell.cxx
 constParameterReference:lexilla/lexers/LexHex.cxx
 knownConditionTrueFalse:lexilla/lexers/LexHex.cxx
-constParameterReference:lexilla/lexers/LexHTML.cxx
 constVariable:lexilla/lexers/LexHollywood.cxx
 variableScope:lexilla/lexers/LexInno.cxx
 constVariableReference:lexilla/lexers/LexInno.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="20240305" />
+    <meta name="Date.Modified" content="20240423" />
     <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.3.1<br />
-           Site last modified March 5 2024</font>
+          <font color="#FFCC99" size="3">Release version 5.3.2<br />
+           Site last modified April 23 2024</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,11 +77,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.3.2 improves COBOL, HTML, Lua, Ruby, and Rust.</li>
       <li>Version 5.3.1 improves Assembler, Bash, Batch, JavaScript, Python, and Ruby.</li>
       <li>Version 5.3.0 improves Bash, HTML, and Lua.</li>
       <li>Version 5.2.9 fixes potential problems on macOS 12 and older when built with Xcode 15.0.</li>
       <li>Version 5.2.8 improves Python and R.</li>
-      <li>Version 5.2.7 improves Bash, F#, and HTML.</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/lexilla531.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla532.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla531.tgz">
+	<a href="https://www.scintilla.org/lexilla532.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.3.1
+       Release 5.3.2
     </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/lexilla531.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla531.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla532.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla532.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
@@ -588,6 +588,57 @@ <h2>Contributors</h2>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla532.zip">Release 5.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 April 2024.
+	</li>
+	<li>
+	COBOL: Stop string literal continuing over line end.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/229">Issue #229</a>.
+	</li>
+	<li>
+	COBOL: Stop doc comment assigning different styles to \r and \n at line end.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/229">Issue #229</a>.
+	</li>
+	<li>
+	COBOL: Recognize keywords that start with 'V'.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/230">Issue #230</a>.
+	</li>
+	<li>
+	COBOL: Recognize comments after tag or that start with '/'.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/231">Issue #231</a>.
+	</li>
+	<li>
+	HTML: Implement substyles for tags, attributes, and identifiers
+	SCE_H_TAG, SCE_H_ATTRIBUTE, SCE_HJ_WORD, SCE_HJA_WORD, SCE_HB_WORD, SCE_HP_WORD, SCE_HPHP_WORD.
+	</li>
+	<li>
+	HTML: Implement context-sensitive attributes. "tag.attribute" matches "attribute" only inside "tag".
+	</li>
+	<li>
+	HTML: Match standard handling of comments.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/232">Issue #232</a>.
+	</li>
+	<li>
+	Lua: Implement substyles for identifiers SCE_LUA_IDENTIFIER.
+	</li>
+	<li>
+	Ruby: Allow non-ASCII here-doc delimiters.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/234">Issue #234</a>.
+	</li>
+	<li>
+	Ruby: Allow modifier if, unless, while and until after heredoc delimiter.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/236">Issue #236</a>.
+	</li>
+	<li>
+	Rust: Recognize raw identifiers.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/239">Issue #239</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/240">Pull request #240</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla531.zip">Release 5.3.1</a>
     </h3>
@@ -12774,7 +12825,7 @@ <h3>
         Pascal lexer handles comments more correctly.
       </li>
       <li>
-        C/C++/Java/JavaScipt lexer has a state for line doc comments.
+        C/C++/Java/JavaScript lexer has a state for line doc comments.
       </li>
       <li>
         Error output lexer understands Sun CC messages.

diff --git a/lexilla/lexers/LexAsm.cxx b/lexilla/lexers/LexAsm.cxx
@@ -240,10 +240,7 @@ Sci_Position SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}

diff --git a/lexilla/lexers/LexBash.cxx b/lexilla/lexers/LexBash.cxx
@@ -483,12 +483,11 @@ class LexerBash final : public DefaultLexer {
 	OptionSetBash osBash;
 	CharacterSet setParamStart;
 	enum { ssIdentifier, ssScalar };
-	SubStyles subStyles;
+	SubStyles subStyles{styleSubable};
 public:
 	LexerBash() :
 		DefaultLexer("bash", SCLEX_BASH, lexicalClasses, std::size(lexicalClasses)),
-		setParamStart(CharacterSet::setAlphaNum, "_" BASH_SPECIAL_PARAMETER),
-		subStyles(styleSubable, 0x80, 0x40, 0) {
+		setParamStart(CharacterSet::setAlphaNum, "_" BASH_SPECIAL_PARAMETER) {
 		cmdDelimiter.Set("| || |& & && ; ;; ( ) { }");
 		bashStruct.Set("if elif fi while until else then do done esac eval");
 		bashStruct_in.Set("for case select");

diff --git a/lexilla/lexers/LexBatch.cxx b/lexilla/lexers/LexBatch.cxx
@@ -59,7 +59,7 @@ constexpr bool IsBSeparator(char ch) noexcept {
 }
 
 // Tests for escape character
-bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
+constexpr bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
 	bool isQoted=false;
 	while (pos>0){
 		pos--;
@@ -71,30 +71,24 @@ bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
 	return isQoted;
 }
 
-// Tests for quote character
-bool textQuoted(const char *lineBuffer, Sci_PositionU endPos) {
-	char strBuffer[1024];
-	strncpy(strBuffer, lineBuffer, endPos);
-	strBuffer[endPos] = '\0';
+constexpr bool IsQuotedBy(std::string_view svBuffer, char quote) noexcept {
 	bool CurrentStatus = false;
-	const char strQuotes[] = "\"'";
-	const size_t strLength = strlen(strQuotes);
-	for (size_t i = 0; i < strLength; i++) {
-		const char *pQuote = strchr(strBuffer, strQuotes[i]);
-		while (pQuote)
-		{
-			if (!IsEscaped(strBuffer, pQuote - strBuffer)) {
-				CurrentStatus = !CurrentStatus;
-			}
-			pQuote = strchr(pQuote + 1, strQuotes[i]);
-		}
-		if (CurrentStatus) {
-			break;
+	size_t pQuote = svBuffer.find(quote);
+	while (pQuote != std::string_view::npos) {
+		if (!IsEscaped(svBuffer.data(), pQuote)) {
+			CurrentStatus = !CurrentStatus;
 		}
+		pQuote = svBuffer.find(quote, pQuote + 1);
 	}
 	return CurrentStatus;
 }
 
+// Tests for quote character
+constexpr bool textQuoted(const char *lineBuffer, Sci_PositionU endPos) noexcept {
+	const std::string_view svBuffer(lineBuffer, endPos);
+	return IsQuotedBy(svBuffer, '\"') || IsQuotedBy(svBuffer, '\'');
+}
+
 void ColouriseBatchDoc(
     Sci_PositionU startPos,
     Sci_Position length,