Skip to content

Commit b8d2777

Browse files
chcgchcg
committed
Update to scintilla 5.5.7 & Lexilla 5.4.5
Release 5.5.7 (https://www.scintilla.org/scintilla557.zip) Released 8 June 2025. Add SCI_SCROLLVERTICAL method to restore view position and maintain it while performing line wrapping. Add SC_UNDO_SELECTION_HISTORY_SCROLL flag to SCI_SETUNDOSELECTIONHISTORY which controls whether undo and redo restore vertical scroll position. Tweak SC_MARK_BAR to be slightly wider by using next higher whole pixel instead of next lower for margin width / 3. Scale images in autocompletion lists with SCI_AUTOCSETIMAGESCALE to match high DPI screens. Initially only on GTK and Qt. Fix wrapping bug for UTF-8 where \r\n could wrap between the characters. Notepad++ Pull Request notepad-plus-plus#16373. Fix crash during painting when scroll bars changed. Bug notepad-plus-plus#2481. On GTK, reset vertical scroll bar synchronously in SCI_SETDOCPOINTER to fix bug where scroll position not restored in non-wrap mode. Bug notepad-plus-plus#2416. On GTK, fix IME problem when tentative composition interfered with delete surrounding. Feature notepad-plus-plus#1476. On GTK, update IME cursor position inside retrieve surrounding to better position candidate window. Feature notepad-plus-plus#1488. Release 5.4.5 (https://www.scintilla.org/lexilla545.zip) Released 8 June 2025. Dart: Add error state SCE_DART_STRINGEOL for unterminated string. Pull request notepad-plus-plus#315. 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'. Nix: Add error state SCE_NIX_STRINGEOL for unterminated string. Pull request notepad-plus-plus#315. TOML: Add error state SCE_TOML_STRINGEOL for unterminated string. Pull request notepad-plus-plus#315. Zig: Add error state SCE_ZIG_STRINGEOL for unterminated string. Pull request notepad-plus-plus#315.
1 parent 299d7cb commit b8d2777

File tree

118 files changed

+1362
-890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1362
-890
lines changed

PowerEditor/scintilla.original.forUpdating/lexilla544.zip renamed to PowerEditor/scintilla.original.forUpdating/lexilla545.zip

1.43 MB
Binary file not shown.

PowerEditor/scintilla.original.forUpdating/scintilla556.zip renamed to PowerEditor/scintilla.original.forUpdating/scintilla557.zip

1.8 MB
Binary file not shown.

‎PowerEditor/visual.net/notepadPlus.sln‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.32002.261
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.14.36202.13 d17.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad++", "notepadPlus.vcxproj", "{FCF60E65-1B78-4D1D-AB59-4FC00AC8C248}"
77
ProjectSection(ProjectDependencies) = postProject
8-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD} = {C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}
8+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD} = {19CCA8B8-46B9-4609-B7CE-198DA19F07BD}
99
{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1} = {E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}
1010
EndProjectSection
1111
EndProject
1212
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lexilla", "..\..\lexilla\src\Lexilla.vcxproj", "{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}"
1313
EndProject
14-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "..\..\scintilla\win32\Scintilla.vcxproj", "{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}"
14+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "..\..\scintilla\win32\Scintilla.vcxproj", "{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,18 +47,18 @@ Global
4747
{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}.Release|Win32.Build.0 = Release|Win32
4848
{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}.Release|x64.ActiveCfg = Release|x64
4949
{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}.Release|x64.Build.0 = Release|x64
50-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|ARM64.ActiveCfg = Debug|ARM64
51-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|ARM64.Build.0 = Debug|ARM64
52-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|Win32.ActiveCfg = Debug|Win32
53-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|Win32.Build.0 = Debug|Win32
54-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|x64.ActiveCfg = Debug|x64
55-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Debug|x64.Build.0 = Debug|x64
56-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|ARM64.ActiveCfg = Release|ARM64
57-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|ARM64.Build.0 = Release|ARM64
58-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|Win32.ActiveCfg = Release|Win32
59-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|Win32.Build.0 = Release|Win32
60-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|x64.ActiveCfg = Release|x64
61-
{C5FBF9A9-FBEF-487B-A5ED-4542E6F03FCD}.Release|x64.Build.0 = Release|x64
50+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|ARM64.ActiveCfg = Debug|ARM64
51+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|ARM64.Build.0 = Debug|ARM64
52+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|Win32.ActiveCfg = Debug|Win32
53+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|Win32.Build.0 = Debug|Win32
54+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|x64.ActiveCfg = Debug|x64
55+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Debug|x64.Build.0 = Debug|x64
56+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|ARM64.ActiveCfg = Release|ARM64
57+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|ARM64.Build.0 = Release|ARM64
58+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|Win32.ActiveCfg = Release|Win32
59+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|Win32.Build.0 = Release|Win32
60+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|x64.ActiveCfg = Release|x64
61+
{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}.Release|x64.Build.0 = Release|x64
6262
EndGlobalSection
6363
GlobalSection(SolutionProperties) = preSolution
6464
HideSolutionNode = FALSE

‎lexilla/README‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ directory conventionally called "lexilla".
2727
To use GCC, run lexilla/src/makefile:
2828
make
2929

30-
To use Clang, run lexilla/test/makefile:
30+
To use Clang, run lexilla/src/makefile:
3131
make CLANG=1
3232
On macOS, CLANG is set automatically so this can just be
3333
make
3434

35-
To use MSVC, run lexilla/test/lexilla.mak:
35+
To use MSVC, run lexilla/src/lexilla.mak:
3636
nmake -f lexilla.mak
3737

3838
To build a debugging version of the library, add DEBUG=1 to the command:

‎lexilla/cppcheck.suppress‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ constParameterPointer:lexilla/lexers/LexTCMD.cxx
171171
invalidscanf:lexilla/lexers/LexTCMD.cxx
172172
constParameterReference:lexilla/lexers/LexTeX.cxx
173173
variableScope:lexilla/lexers/LexTeX.cxx
174-
constVariableReference:lexilla/lexers/LexTroff.cxx
175174
knownConditionTrueFalse:lexilla/lexers/LexVB.cxx
176175
constParameterReference:lexilla/lexers/LexVerilog.cxx
177176
variableScope:lexilla/lexers/LexVerilog.cxx

‎lexilla/doc/Lexilla.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
1010
<meta name="Description"
1111
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
12-
<meta name="Date.Modified" content="20250402" />
12+
<meta name="Date.Modified" content="20250608" />
1313
<meta name="viewport" content="width=device-width, initial-scale=1" />
1414
<style type="text/css">
1515
.logo {
@@ -62,8 +62,8 @@
6262
<font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
6363
</td>
6464
<td width="40%" align="right">
65-
<font color="#FFCC99" size="3">Release version 5.4.4<br />
66-
Site last modified April 2 2025</font>
65+
<font color="#FFCC99" size="3">Release version 5.4.5<br />
66+
Site last modified June 8 2025</font>
6767
</td>
6868
<td width="20%">
6969
&nbsp;
@@ -78,11 +78,11 @@
7878
</tr>
7979
</table>
8080
<ul id="versionlist">
81-
<li>Version 5.4.4 fixes a problem when building for ARM654 on Windows.</li>
81+
<li>Version 5.4.5 improves Dart, Makefile, Nix, TOML, and Zig.</li>
82+
<li>Version 5.4.4 fixes a problem when building for ARM64 on Windows.</li>
8283
<li>Version 5.4.3 improves C++, Modula 3, Pascal, Python, and Ruby.</li>
8384
<li>Version 5.4.2 adds Nix lexer. Improves JavaScript, PHP, Rust, TOML, and Zig.</li>
8485
<li>Version 5.4.1 adds Dart, troff, and Zig lexers. Improves C++, F#, HTML, and Smalltalk.</li>
85-
<li>Version 5.4.0 adds a TOML lexer.</li>
8686
</ul>
8787
<ul id="menu">
8888
<li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

‎lexilla/doc/LexillaDownload.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
2727
<tr>
2828
<td>
29-
<font size="4"> <a href="https://www.scintilla.org/lexilla544.zip">
29+
<font size="4"> <a href="https://www.scintilla.org/lexilla545.zip">
3030
Windows</a>&nbsp;&nbsp;
31-
<a href="https://www.scintilla.org/lexilla544.tgz">
31+
<a href="https://www.scintilla.org/lexilla545.tgz">
3232
GTK/Linux</a>&nbsp;&nbsp;
3333
</font>
3434
</td>
@@ -42,16 +42,16 @@ <h2>
4242
containing very few restrictions.
4343
</p>
4444
<h3>
45-
Release 5.4.4
45+
Release 5.4.5
4646
</h3>
4747
<h4>
4848
Source Code
4949
</h4>
5050
The source code package contains all of the source code for Lexilla but no binary
5151
executable code and is available in
5252
<ul>
53-
<li><a href="https://www.scintilla.org/lexilla544.zip">zip format</a> (1.4M) commonly used on Windows</li>
54-
<li><a href="https://www.scintilla.org/lexilla544.tgz">tgz format</a> (1.0M) commonly used on Linux and compatible operating systems</li>
53+
<li><a href="https://www.scintilla.org/lexilla545.zip">zip format</a> (1.4M) commonly used on Windows</li>
54+
<li><a href="https://www.scintilla.org/lexilla545.tgz">tgz format</a> (1.0M) commonly used on Linux and compatible operating systems</li>
5555
</ul>
5656
Instructions for building on both Windows and Linux are included in the readme file.
5757
<h4>

‎lexilla/doc/LexillaHistory.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,34 @@ <h2>Contributors</h2>
594594
</tr>
595595
</table>
596596
<h2 id="Releases">Releases</h2>
597+
<h3>
598+
<a href="https://www.scintilla.org/lexilla545.zip">Release 5.4.5</a>
599+
</h3>
600+
<ul>
601+
<li>
602+
Released 8 June 2025.
603+
</li>
604+
<li>
605+
Dart: Add error state SCE_DART_STRINGEOL for unterminated string.
606+
<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
607+
</li>
608+
<li>
609+
Makefile: Add a keyword list to makefile lexer to highlight GNU Make directives like 'ifdef' and 'vpath' as
610+
SCE_MAKE_PREPROCESSOR since these are similar to NMAKE directives like '!IFDEF'.
611+
</li>
612+
<li>
613+
Nix: Add error state SCE_NIX_STRINGEOL for unterminated string.
614+
<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
615+
</li>
616+
<li>
617+
TOML: Add error state SCE_TOML_STRINGEOL for unterminated string.
618+
<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
619+
</li>
620+
<li>
621+
Zig: Add error state SCE_ZIG_STRINGEOL for unterminated string.
622+
<a href="https://github.com/ScintillaOrg/lexilla/pull/315">Pull request #315</a>.
623+
</li>
624+
</ul>
597625
<h3>
598626
<a href="https://www.scintilla.org/lexilla544.zip">Release 5.4.4</a>
599627
</h3>

‎lexilla/include/LexicalStyles.iface‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,6 +2349,7 @@ val SCE_TOML_TRIPLE_STRING_SQ=11
23492349
val SCE_TOML_TRIPLE_STRING_DQ=12
23502350
val SCE_TOML_ESCAPECHAR=13
23512351
val SCE_TOML_DATETIME=14
2352+
val SCE_TOML_STRINGEOL=15
23522353
# Lexical states for SCLEX_TROFF
23532354
lex troff=SCLEX_TROFF SCE_TROFF_
23542355
val SCE_TROFF_DEFAULT=0
@@ -2408,6 +2409,7 @@ val SCE_DART_KW_PRIMARY=23
24082409
val SCE_DART_KW_SECONDARY=24
24092410
val SCE_DART_KW_TERTIARY=25
24102411
val SCE_DART_KW_TYPE=26
2412+
val SCE_DART_STRINGEOL=27
24112413
# Lexical states for SCLEX_ZIG
24122414
lex Zig=SCLEX_ZIG SCE_ZIG_
24132415
val SCE_ZIG_DEFAULT=0
@@ -2428,6 +2430,7 @@ val SCE_ZIG_KW_SECONDARY=14
24282430
val SCE_ZIG_KW_TERTIARY=15
24292431
val SCE_ZIG_KW_TYPE=16
24302432
val SCE_ZIG_IDENTIFIER_STRING=17
2433+
val SCE_ZIG_STRINGEOL=18
24312434
# Lexical states for SCLEX_NIX
24322435
lex Nix=SCLEX_NIX SCE_NIX_
24332436
val SCE_NIX_DEFAULT=0
@@ -2446,3 +2449,4 @@ val SCE_NIX_KEYWORD1=12
24462449
val SCE_NIX_KEYWORD2=13
24472450
val SCE_NIX_KEYWORD3=14
24482451
val SCE_NIX_KEYWORD4=15
2452+
val SCE_NIX_STRINGEOL=16

‎lexilla/include/SciLexer.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,7 @@
20982098
#define SCE_TOML_TRIPLE_STRING_DQ 12
20992099
#define SCE_TOML_ESCAPECHAR 13
21002100
#define SCE_TOML_DATETIME 14
2101+
#define SCE_TOML_STRINGEOL 15
21012102
#define SCE_TROFF_DEFAULT 0
21022103
#define SCE_TROFF_REQUEST 1
21032104
#define SCE_TROFF_COMMAND 2
@@ -2153,6 +2154,7 @@
21532154
#define SCE_DART_KW_SECONDARY 24
21542155
#define SCE_DART_KW_TERTIARY 25
21552156
#define SCE_DART_KW_TYPE 26
2157+
#define SCE_DART_STRINGEOL 27
21562158
#define SCE_ZIG_DEFAULT 0
21572159
#define SCE_ZIG_COMMENTLINE 1
21582160
#define SCE_ZIG_COMMENTLINEDOC 2
@@ -2171,6 +2173,7 @@
21712173
#define SCE_ZIG_KW_TERTIARY 15
21722174
#define SCE_ZIG_KW_TYPE 16
21732175
#define SCE_ZIG_IDENTIFIER_STRING 17
2176+
#define SCE_ZIG_STRINGEOL 18
21742177
#define SCE_NIX_DEFAULT 0
21752178
#define SCE_NIX_COMMENTLINE 1
21762179
#define SCE_NIX_COMMENTBLOCK 2
@@ -2187,6 +2190,7 @@
21872190
#define SCE_NIX_KEYWORD2 13
21882191
#define SCE_NIX_KEYWORD3 14
21892192
#define SCE_NIX_KEYWORD4 15
2193+
#define SCE_NIX_STRINGEOL 16
21902194
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
21912195

21922196

0 commit comments

Comments
 (0)