Release notes are here https://scintilla.org/ScintillaHistory.html

The update was pretty straightforward, there doesn't seem to be anything special we'd need to address.

I only added some mappings for newly introduced styles. As I added several lexers in this release, the version of SciLexer.h in Geany is pretty much up to date so I checked out the commit of the previous Scintilla update and diffed against it. This is the result:

Full diff
--- geany2/geany/scintilla/lexilla/include/SciLexer.h	2024-12-20 22:42:18.933032000 +0100
+++ geany/scintilla/lexilla/include/SciLexer.h	2024-12-17 22:42:38.000000000 +0100
@@ -148,6 +148,11 @@
 #define SCLEX_JULIA 133
 #define SCLEX_ASCIIDOC 134
 #define SCLEX_GDSCRIPT 135
+#define SCLEX_TOML 136
+#define SCLEX_TROFF 137
+#define SCLEX_DART 138
+#define SCLEX_ZIG 139
+#define SCLEX_NIX 140
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -198,6 +203,19 @@
 #define SCE_C_USERLITERAL 25
 #define SCE_C_TASKMARKER 26
 #define SCE_C_ESCAPESEQUENCE 27
+#define SCE_COBOL_DEFAULT 0
+#define SCE_COBOL_COMMENT 1
+#define SCE_COBOL_COMMENTLINE 2
+#define SCE_COBOL_COMMENTDOC 3
+#define SCE_COBOL_NUMBER 4
+#define SCE_COBOL_WORD 5
+#define SCE_COBOL_STRING 6
+#define SCE_COBOL_CHARACTER 7
+#define SCE_COBOL_WORD3 8
+#define SCE_COBOL_PREPROCESSOR 9
+#define SCE_COBOL_OPERATOR 10
+#define SCE_COBOL_IDENTIFIER 11
+#define SCE_COBOL_WORD2 16
 #define SCE_D_DEFAULT 0
 #define SCE_D_COMMENT 1
 #define SCE_D_COMMENTLINE 2
@@ -288,6 +306,7 @@
 #define SCE_HJ_SYMBOLS 50
 #define SCE_HJ_STRINGEOL 51
 #define SCE_HJ_REGEX 52
+#define SCE_HJ_TEMPLATELITERAL 53
 #define SCE_HJA_START 55
 #define SCE_HJA_DEFAULT 56
 #define SCE_HJA_COMMENT 57
@@ -301,6 +320,7 @@
 #define SCE_HJA_SYMBOLS 65
 #define SCE_HJA_STRINGEOL 66
 #define SCE_HJA_REGEX 67
+#define SCE_HJA_TEMPLATELITERAL 68
 #define SCE_HB_START 70
 #define SCE_HB_DEFAULT 71
 #define SCE_HB_COMMENTLINE 72
@@ -1790,6 +1810,8 @@
 #define SCE_RUST_BYTESTRING 21
 #define SCE_RUST_BYTESTRINGR 22
 #define SCE_RUST_BYTECHARACTER 23
+#define SCE_RUST_CSTRING 24
+#define SCE_RUST_CSTRINGR 25
 #define SCE_DMAP_DEFAULT 0
 #define SCE_DMAP_COMMENT 1
 #define SCE_DMAP_NUMBER 2
@@ -2058,6 +2080,110 @@
 #define SCE_GD_WORD2 14
 #define SCE_GD_ANNOTATION 15
 #define SCE_GD_NODEPATH 16
+#define SCE_TOML_DEFAULT 0
+#define SCE_TOML_COMMENT 1
+#define SCE_TOML_IDENTIFIER 2
+#define SCE_TOML_KEYWORD 3
+#define SCE_TOML_NUMBER 4
+#define SCE_TOML_TABLE 5
+#define SCE_TOML_KEY 6
+#define SCE_TOML_ERROR 7
+#define SCE_TOML_OPERATOR 8
+#define SCE_TOML_STRING_SQ 9
+#define SCE_TOML_STRING_DQ 10
+#define SCE_TOML_TRIPLE_STRING_SQ 11
+#define SCE_TOML_TRIPLE_STRING_DQ 12
+#define SCE_TOML_ESCAPECHAR 13
+#define SCE_TOML_DATETIME 14
+#define SCE_TROFF_DEFAULT 0
+#define SCE_TROFF_REQUEST 1
+#define SCE_TROFF_COMMAND 2
+#define SCE_TROFF_NUMBER 3
+#define SCE_TROFF_OPERATOR 4
+#define SCE_TROFF_STRING 5
+#define SCE_TROFF_COMMENT 6
+#define SCE_TROFF_IGNORE 7
+#define SCE_TROFF_ESCAPE_STRING 8
+#define SCE_TROFF_ESCAPE_MACRO 9
+#define SCE_TROFF_ESCAPE_FONT 10
+#define SCE_TROFF_ESCAPE_NUMBER 11
+#define SCE_TROFF_ESCAPE_COLOUR 12
+#define SCE_TROFF_ESCAPE_GLYPH 13
+#define SCE_TROFF_ESCAPE_ENV 14
+#define SCE_TROFF_ESCAPE_SUPPRESSION 15
+#define SCE_TROFF_ESCAPE_SIZE 16
+#define SCE_TROFF_ESCAPE_TRANSPARENT 17
+#define SCE_TROFF_ESCAPE_ISVALID 18
+#define SCE_TROFF_ESCAPE_DRAW 19
+#define SCE_TROFF_ESCAPE_MOVE 20
+#define SCE_TROFF_ESCAPE_HEIGHT 21
+#define SCE_TROFF_ESCAPE_OVERSTRIKE 22
+#define SCE_TROFF_ESCAPE_SLANT 23
+#define SCE_TROFF_ESCAPE_WIDTH 24
+#define SCE_TROFF_ESCAPE_VSPACING 25
+#define SCE_TROFF_ESCAPE_DEVICE 26
+#define SCE_TROFF_ESCAPE_NOMOVE 27
+#define SCE_DART_DEFAULT 0
+#define SCE_DART_COMMENTLINE 1
+#define SCE_DART_COMMENTLINEDOC 2
+#define SCE_DART_COMMENTBLOCK 3
+#define SCE_DART_COMMENTBLOCKDOC 4
+#define SCE_DART_STRING_SQ 5
+#define SCE_DART_STRING_DQ 6
+#define SCE_DART_TRIPLE_STRING_SQ 7
+#define SCE_DART_TRIPLE_STRING_DQ 8
+#define SCE_DART_RAWSTRING_SQ 9
+#define SCE_DART_RAWSTRING_DQ 10
+#define SCE_DART_TRIPLE_RAWSTRING_SQ 11
+#define SCE_DART_TRIPLE_RAWSTRING_DQ 12
+#define SCE_DART_ESCAPECHAR 13
+#define SCE_DART_IDENTIFIER 14
+#define SCE_DART_IDENTIFIER_STRING 15
+#define SCE_DART_OPERATOR 16
+#define SCE_DART_OPERATOR_STRING 17
+#define SCE_DART_SYMBOL_IDENTIFIER 18
+#define SCE_DART_SYMBOL_OPERATOR 19
+#define SCE_DART_NUMBER 20
+#define SCE_DART_KEY 21
+#define SCE_DART_METADATA 22
+#define SCE_DART_KW_PRIMARY 23
+#define SCE_DART_KW_SECONDARY 24
+#define SCE_DART_KW_TERTIARY 25
+#define SCE_DART_KW_TYPE 26
+#define SCE_ZIG_DEFAULT 0
+#define SCE_ZIG_COMMENTLINE 1
+#define SCE_ZIG_COMMENTLINEDOC 2
+#define SCE_ZIG_COMMENTLINETOP 3
+#define SCE_ZIG_NUMBER 4
+#define SCE_ZIG_OPERATOR 5
+#define SCE_ZIG_CHARACTER 6
+#define SCE_ZIG_STRING 7
+#define SCE_ZIG_MULTISTRING 8
+#define SCE_ZIG_ESCAPECHAR 9
+#define SCE_ZIG_IDENTIFIER 10
+#define SCE_ZIG_FUNCTION 11
+#define SCE_ZIG_BUILTIN_FUNCTION 12
+#define SCE_ZIG_KW_PRIMARY 13
+#define SCE_ZIG_KW_SECONDARY 14
+#define SCE_ZIG_KW_TERTIARY 15
+#define SCE_ZIG_KW_TYPE 16
+#define SCE_ZIG_IDENTIFIER_STRING 17
+#define SCE_NIX_DEFAULT 0
+#define SCE_NIX_COMMENTLINE 1
+#define SCE_NIX_COMMENTBLOCK 2
+#define SCE_NIX_STRING 3
+#define SCE_NIX_STRING_MULTILINE 4
+#define SCE_NIX_ESCAPECHAR 5
+#define SCE_NIX_IDENTIFIER 6
+#define SCE_NIX_OPERATOR 7
+#define SCE_NIX_OPERATOR_STRING 8
+#define SCE_NIX_NUMBER 9
+#define SCE_NIX_KEY 10
+#define SCE_NIX_PATH 11
+#define SCE_NIX_KEYWORD1 12
+#define SCE_NIX_KEYWORD2 13
+#define SCE_NIX_KEYWORD3 14
+#define SCE_NIX_KEYWORD4 15
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif

The Cobol styles are identical to C styles (ScintillaOrg/lexilla@50373fa) so we can keep reusing them.

I also fixed a a problem in Rust raw byte string mapping that was introduced some time in the past.

Fixes #2750
Fixes #3658
Fixes #3310

Closes #4080
Closes #4034


You can view, comment on, or merge this pull request online at:

  https://github.com/geany/geany/pull/4168

Commit Summary

File Changes

(138 files)

Patch Links:


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <geany/geany/pull/4168@github.com>