dail8859 · dail8859 · Jun 15, 2025 · Jun 14, 2025 · Jun 14, 2025 · Jun 15, 2025
diff --git a/src/NotepadNext/decorators/HighlightedScrollBar.cpp b/src/NotepadNext/decorators/HighlightedScrollBar.cpp
@@ -32,7 +32,7 @@ const QColor CURSOR_CARET_COLOR = QColor(0, 0, 0, 100);
 HighlightedScrollBarDecorator::HighlightedScrollBarDecorator(ScintillaNext *editor)
     : EditorDecorator(editor), scrollBar(new HighlightedScrollBar(editor, Qt::Vertical, editor))
 {
-    connect(scrollBar, &QScrollBar::valueChanged, editor, &ScintillaEdit::scrollVertical);
+    connect(scrollBar, &QScrollBar::valueChanged, editor, &ScintillaEditBase::scrollVertical);
 
     editor->setVerticalScrollBar(scrollBar);
 }

diff --git a/src/lexilla/README b/src/lexilla/README
@@ -27,12 +27,12 @@ directory conventionally called "lexilla".
 To use GCC, run lexilla/src/makefile:
 	make
 
-To use Clang, run lexilla/test/makefile:
+To use Clang, run lexilla/src/makefile:
 	make CLANG=1
 On macOS, CLANG is set automatically so this can just be
 	make
 
-To use MSVC, run lexilla/test/lexilla.mak:
+To use MSVC, run lexilla/src/lexilla.mak:
 	nmake -f lexilla.mak
 
 To build a debugging version of the library, add DEBUG=1 to the command:

diff --git a/src/lexilla/access/LexillaAccess.cxx b/src/lexilla/access/LexillaAccess.cxx
@@ -30,12 +30,12 @@
 namespace {
 
 #if defined(_WIN32)
-typedef FARPROC Function;
-typedef HMODULE Module;
+using Function = FARPROC;
+using Module = HMODULE;
 constexpr const char *pathSeparator = "\\";
 #else
-typedef void *Function;
-typedef void *Module;
+using Function = void *;
+using Module = void *;
 constexpr const char *pathSeparator = "/";
 #endif
 
@@ -164,9 +164,10 @@ bool Lexilla::Load(std::string_view sharedLibraryPaths) {
 			if (fnLexerCount && fnLexerName) {
 				const int nLexers = fnLexerCount();
 				for (int i = 0; i < nLexers; i++) {
-					char name[100] = "";
+					constexpr size_t lengthName = 200;
+					char name[lengthName]{};
 					fnLexerName(i, name, sizeof(name));
-					lexers.push_back(name);
+					lexers.emplace_back(name);
 				}
 			}
 			CreateLexerFn fnCL = FunctionPointer<CreateLexerFn>(
@@ -268,7 +269,7 @@ std::string Lexilla::NameFromID(int identifier) {
 			}
 		}
 	}
-	return std::string();
+	return {};
 }
 
 std::vector<std::string> Lexilla::LibraryProperties() {

diff --git a/src/lexilla/cppcheck.suppress b/src/lexilla/cppcheck.suppress
@@ -70,12 +70,14 @@ variableScope:lexilla/lexers/LexCmake.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
 constParameterReference:lexilla/lexers/LexCmake.cxx
 constParameterReference:lexilla/lexers/LexCOBOL.cxx
+constVariablePointer:lexilla/lexers/LexCOBOL.cxx
 constParameterReference:lexilla/lexers/LexCoffeeScript.cxx
 constParameterPointer:lexilla/lexers/LexCoffeeScript.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCoffeeScript.cxx
 constVariableReference:lexilla/lexers/LexConf.cxx
 constParameterReference:lexilla/lexers/LexCPP.cxx
 variableScope:lexilla/lexers/LexCSS.cxx
+constVariablePointer:lexilla/lexers/LexCSS.cxx
 knownConditionTrueFalse:lexilla/lexers/LexDataflex.cxx
 constParameterReference:lexilla/lexers/LexDataflex.cxx
 variableScope:lexilla/lexers/LexDataflex.cxx
@@ -118,6 +120,7 @@ unreadVariable:lexilla/lexers/LexMatlab.cxx
 variableScope:lexilla/lexers/LexMatlab.cxx
 variableScope:lexilla/lexers/LexMetapost.cxx
 constParameterReference:lexilla/lexers/LexModula.cxx
+duplicateBreak:lexilla/lexers/LexModula.cxx
 variableScope:lexilla/lexers/LexModula.cxx
 constParameterReference:lexilla/lexers/LexMPT.cxx
 variableScope:lexilla/lexers/LexMSSQL.cxx
@@ -140,6 +143,7 @@ constVariableReference:lexilla/lexers/LexPerl.cxx
 knownConditionTrueFalse:lexilla/lexers/LexPerl.cxx
 constParameterReference:lexilla/lexers/LexPLM.cxx
 constParameterReference:lexilla/lexers/LexPO.cxx
+constVariablePointer:lexilla/lexers/LexPOV.cxx
 constParameterReference:lexilla/lexers/LexPython.cxx
 shadowVariable:lexilla/lexers/LexPowerPro.cxx
 knownConditionTrueFalse:lexilla/lexers/LexPowerPro.cxx
@@ -167,7 +171,6 @@ constParameterPointer:lexilla/lexers/LexTCMD.cxx
 invalidscanf:lexilla/lexers/LexTCMD.cxx
 constParameterReference:lexilla/lexers/LexTeX.cxx
 variableScope:lexilla/lexers/LexTeX.cxx
-constVariableReference:lexilla/lexers/LexTroff.cxx
 knownConditionTrueFalse:lexilla/lexers/LexVB.cxx
 constParameterReference:lexilla/lexers/LexVerilog.cxx
 variableScope:lexilla/lexers/LexVerilog.cxx
@@ -188,7 +191,6 @@ constVariableReference:lexilla/lexers/LexX12.cxx
 constParameterPointer:lexilla/lexers/LexX12.cxx
 uselessCallsSubstr:lexilla/lexers/LexX12.cxx
 constParameterReference:lexilla/lexers/LexYAML.cxx
-constParameterPointer:lexilla/lexers/LexYAML.cxx
 knownConditionTrueFalse:lexilla/lexers/LexYAML.cxx
 
 // These are due to Accessor::IndentAmount not declaring the callback as taking a const.

diff --git a/src/lexilla/doc/Lexilla.html b/src/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="20250225" />
+    <meta name="Date.Modified" content="20250608" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -51,6 +51,7 @@
      <title>
        Lexilla
      </title>
+    <link rel="canonical" href="https://scintilla.org/Lexilla.html" />
   </head>
   <body bgcolor="#FFFFFF" text="#000000">
     <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
@@ -61,8 +62,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.4.3<br />
-           Site last modified February 25 2025</font>
+          <font color="#FFCC99" size="3">Release version 5.4.5<br />
+           Site last modified June 8 2025</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,11 +78,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.4.5 improves Dart, Makefile, Nix, TOML, and Zig.</li>
+      <li>Version 5.4.4 fixes a problem when building for ARM64 on Windows.</li>
       <li>Version 5.4.3 improves C++, Modula 3, Pascal, Python, and Ruby.</li>
       <li>Version 5.4.2 adds Nix lexer. Improves JavaScript, PHP, Rust, TOML, and Zig.</li>
       <li>Version 5.4.1 adds Dart, troff, and Zig lexers. Improves C++, F#, HTML, and Smalltalk.</li>
-      <li>Version 5.4.0 adds a TOML lexer.</li>
-      <li>Version 5.3.3 improves HTML, JavaScript, Lua, PHP, and XML.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

diff --git a/src/lexilla/doc/LexillaDoc.html b/src/lexilla/doc/LexillaDoc.html
@@ -10,6 +10,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 
     <title>Lexilla Documentation</title>
+    <link rel="canonical" href="https://scintilla.org/LexillaDoc.html" />
 
     <style type="text/css">
 <!--

diff --git a/src/lexilla/doc/LexillaDownload.html b/src/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/lexilla543.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla545.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla543.tgz">
+	<a href="https://www.scintilla.org/lexilla545.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.4.3
+       Release 5.4.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/lexilla543.zip">zip format</a> (1.4M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla543.tgz">tgz format</a> (1.0M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla545.zip">zip format</a> (1.4M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla545.tgz">tgz format</a> (1.0M) 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/src/lexilla/doc/LexillaHistory.html b/src/lexilla/doc/LexillaHistory.html
@@ -590,9 +590,50 @@ <h2>Contributors</h2>
 	<td>Henrik S. Johansen</td>
 	<td>Ekopalypse</td>
 	<td>HoTschir</td>
+	<td>Ahmet Sait</td>
     </tr>
     </table>
     <h2 id="Releases">Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla545.zip">Release 5.4.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 June 2025.
+	</li>
+	<li>
+	Dart: Add error state SCE_DART_STRINGEOL for unterminated string.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
+	</li>
+	<li>
+	Makefile: Add a keyword list to makefile lexer to highlight GNU Make directives like 'ifdef' and 'vpath' as
+	SCE_MAKE_PREPROCESSOR since these are similar to NMAKE directives like '!IFDEF'.
+	</li>
+	<li>
+	Nix: Add error state SCE_NIX_STRINGEOL for unterminated string.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
+	</li>
+	<li>
+	TOML: Add error state SCE_TOML_STRINGEOL for unterminated string.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
+	</li>
+	<li>
+	Zig: Add error state SCE_ZIG_STRINGEOL for unterminated string.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla544.zip">Release 5.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 April 2025.
+	</li>
+	<li>
+	Fix building for ARM64.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/308">Pull request #308</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla543.zip">Release 5.4.3</a>
     </h3>

diff --git a/src/lexilla/include/LexicalStyles.iface b/src/lexilla/include/LexicalStyles.iface
@@ -2349,6 +2349,7 @@ val SCE_TOML_TRIPLE_STRING_SQ=11
 val SCE_TOML_TRIPLE_STRING_DQ=12
 val SCE_TOML_ESCAPECHAR=13
 val SCE_TOML_DATETIME=14
+val SCE_TOML_STRINGEOL=15
 # Lexical states for SCLEX_TROFF
 lex troff=SCLEX_TROFF SCE_TROFF_
 val SCE_TROFF_DEFAULT=0
@@ -2408,6 +2409,7 @@ val SCE_DART_KW_PRIMARY=23
 val SCE_DART_KW_SECONDARY=24
 val SCE_DART_KW_TERTIARY=25
 val SCE_DART_KW_TYPE=26
+val SCE_DART_STRINGEOL=27
 # Lexical states for SCLEX_ZIG
 lex Zig=SCLEX_ZIG SCE_ZIG_
 val SCE_ZIG_DEFAULT=0
@@ -2428,6 +2430,7 @@ val SCE_ZIG_KW_SECONDARY=14
 val SCE_ZIG_KW_TERTIARY=15
 val SCE_ZIG_KW_TYPE=16
 val SCE_ZIG_IDENTIFIER_STRING=17
+val SCE_ZIG_STRINGEOL=18
 # Lexical states for SCLEX_NIX
 lex Nix=SCLEX_NIX SCE_NIX_
 val SCE_NIX_DEFAULT=0
@@ -2446,3 +2449,4 @@ val SCE_NIX_KEYWORD1=12
 val SCE_NIX_KEYWORD2=13
 val SCE_NIX_KEYWORD3=14
 val SCE_NIX_KEYWORD4=15
+val SCE_NIX_STRINGEOL=16
diff --git a/src/lexilla/include/SciLexer.h b/src/lexilla/include/SciLexer.h
@@ -2095,6 +2095,7 @@
 #define SCE_TOML_TRIPLE_STRING_DQ 12
 #define SCE_TOML_ESCAPECHAR 13
 #define SCE_TOML_DATETIME 14
+#define SCE_TOML_STRINGEOL 15
 #define SCE_TROFF_DEFAULT 0
 #define SCE_TROFF_REQUEST 1
 #define SCE_TROFF_COMMAND 2
@@ -2150,6 +2151,7 @@
 #define SCE_DART_KW_SECONDARY 24
 #define SCE_DART_KW_TERTIARY 25
 #define SCE_DART_KW_TYPE 26
+#define SCE_DART_STRINGEOL 27
 #define SCE_ZIG_DEFAULT 0
 #define SCE_ZIG_COMMENTLINE 1
 #define SCE_ZIG_COMMENTLINEDOC 2
@@ -2168,6 +2170,7 @@
 #define SCE_ZIG_KW_TERTIARY 15
 #define SCE_ZIG_KW_TYPE 16
 #define SCE_ZIG_IDENTIFIER_STRING 17
+#define SCE_ZIG_STRINGEOL 18
 #define SCE_NIX_DEFAULT 0
 #define SCE_NIX_COMMENTLINE 1
 #define SCE_NIX_COMMENTBLOCK 2
@@ -2184,6 +2187,7 @@
 #define SCE_NIX_KEYWORD2 13
 #define SCE_NIX_KEYWORD3 14
 #define SCE_NIX_KEYWORD4 15
+#define SCE_NIX_STRINGEOL 16
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif