[Zig] Fix \u{} escape highlighting, highlight top-level comment.

zufuliu · Aug 24, 2024 · a88cba6 · a88cba6
1 parent 3ca39c8
commit a88cba6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
@@ -1827,21 +1827,22 @@
 #define SCE_ZIG_DEFAULT 0
 #define SCE_ZIG_COMMENTLINE 1
 #define SCE_ZIG_COMMENTLINEDOC 2
-#define SCE_ZIG_TASKMARKER 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_FORMAT_SPECIFIER 10
-#define SCE_ZIG_PLACEHOLDER 11
-#define SCE_ZIG_IDENTIFIER 12
-#define SCE_ZIG_BUILTIN_FUNCTION 13
-#define SCE_ZIG_WORD 14
-#define SCE_ZIG_TYPE 15
-#define SCE_ZIG_FUNCTION 16
-#define SCE_ZIG_FUNCTION_DEFINITION 17
+#define SCE_ZIG_COMMENTLINETOP 3
+#define SCE_ZIG_TASKMARKER 4
+#define SCE_ZIG_NUMBER 5
+#define SCE_ZIG_OPERATOR 6
+#define SCE_ZIG_CHARACTER 7
+#define SCE_ZIG_STRING 8
+#define SCE_ZIG_MULTISTRING 9
+#define SCE_ZIG_ESCAPECHAR 10
+#define SCE_ZIG_FORMAT_SPECIFIER 11
+#define SCE_ZIG_PLACEHOLDER 12
+#define SCE_ZIG_IDENTIFIER 13
+#define SCE_ZIG_BUILTIN_FUNCTION 14
+#define SCE_ZIG_WORD 15
+#define SCE_ZIG_TYPE 16
+#define SCE_ZIG_FUNCTION 17
+#define SCE_ZIG_FUNCTION_DEFINITION 18
 #define SCE_MATHEMATICA_DEFAULT 0
 #define SCE_MATHEMATICA_COMMENTLINE 1
 #define SCE_MATHEMATICA_COMMENT 2

diff --git a/scintilla/include/SciLexer.iface b/scintilla/include/SciLexer.iface
@@ -3135,6 +3135,7 @@ lex Zig=SCLEX_ZIG SCE_ZIG_
 val SCE_ZIG_DEFAULT=
 val SCE_ZIG_COMMENTLINE=
 val SCE_ZIG_COMMENTLINEDOC=
+val SCE_ZIG_COMMENTLINETOP=
 val SCE_ZIG_TASKMARKER=
 val SCE_ZIG_NUMBER=
 val SCE_ZIG_OPERATOR=

diff --git a/scintilla/lexers/LexZig.cxx b/scintilla/lexers/LexZig.cxx
@@ -210,6 +210,7 @@ void ColouriseZigDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 				sc.Forward();
 				if (sc.Match('u', '{')) {
 					escSeq.brace = true;
+					escSeq.digitsLeft = 7;
 					sc.Forward();
 				}
 			} else if ((sc.ch == '\'' && sc.state == SCE_ZIG_CHARACTER) || (sc.ch == '\"' && sc.state == SCE_ZIG_STRING)) {
@@ -277,6 +278,7 @@ void ColouriseZigDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 
 		case SCE_ZIG_COMMENTLINE:
 		case SCE_ZIG_COMMENTLINEDOC:
+		case SCE_ZIG_COMMENTLINETOP:
 			if (sc.atLineStart) {
 				sc.SetState(SCE_ZIG_DEFAULT);
 			}
@@ -289,8 +291,10 @@ void ColouriseZigDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 					lineState = ZigLineStateMaskLineComment;
 				}
 				sc.SetState(SCE_ZIG_COMMENTLINE);
-				sc.Forward();
-				if (sc.chNext == '!' || sc.chNext == '/') {
+				sc.Forward(2);
+				if (sc.ch == '!') {
+					sc.ChangeState(SCE_ZIG_COMMENTLINETOP);
+				} else if (sc.ch == '/' && sc.chNext != '/') {
 					sc.ChangeState(SCE_ZIG_COMMENTLINEDOC);
 				}
 			} else if (sc.Match('\\', '\\')) {

diff --git a/src/EditLexers/stlZig.cpp b/src/EditLexers/stlZig.cpp
@@ -29,7 +29,7 @@ static EDITSTYLE Styles_Zig[] = {
 	{ SCE_ZIG_FUNCTION_DEFINITION, NP2StyleX_FunctionDefinition, L"bold; fore:#0080C0" },
 	{ SCE_ZIG_FUNCTION, NP2StyleX_Function, L"fore:#A46000" },
 	{ SCE_ZIG_COMMENTLINE, NP2StyleX_Comment, L"fore:#608060" },
-	{ SCE_ZIG_COMMENTLINEDOC, NP2StyleX_DocComment, L"fore:#408040" },
+	{ MULTI_STYLE(SCE_ZIG_COMMENTLINEDOC, SCE_ZIG_COMMENTLINETOP, 0, 0), NP2StyleX_DocComment, L"fore:#408040" },
 	{ MULTI_STYLE(SCE_ZIG_CHARACTER, SCE_ZIG_STRING, 0, 0), NP2StyleX_String, L"fore:#008000" },
 	{ SCE_ZIG_MULTISTRING, NP2StyleX_RawString, L"fore:#008080" },
 	{ SCE_ZIG_ESCAPECHAR, NP2StyleX_EscapeSequence, L"fore:#0080C0" },