#315 Zig: Add error state for unterminated string

techee · nyamatongwe · commit 99200ed7607a · 2025-05-14T08:29:34.000+10:00
diff --git a/doc/LexillaHistory.html b/doc/LexillaHistory.html
@@ -613,6 +613,10 @@ <h3>
 	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>
diff --git a/include/LexicalStyles.iface b/include/LexicalStyles.iface
@@ -2430,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
diff --git a/include/SciLexer.h b/include/SciLexer.h
@@ -2170,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
diff --git a/lexers/LexZig.cxx b/lexers/LexZig.cxx
@@ -163,6 +163,7 @@ LexicalClass lexicalClasses[] = {
 	15, "SCE_ZIG_KW_TERTIARY", "identifier", "Tertiary keywords",
 	16, "SCE_ZIG_KW_TYPE", "identifier", "Global types",
 	17, "SCE_ZIG_IDENTIFIER_STRING", "identifier", "Identifier using @\"\" syntax",
+	18, "SCE_ZIG_STRINGEOL", "error literal string", "End of line where string is not closed",
 };
 
 class LexerZig : public DefaultLexer {
@@ -262,6 +263,10 @@ void LexerZig::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle
 	int lineState = 0;
 	EscapeSequence escSeq;
 
+	if (initStyle == SCE_ZIG_STRINGEOL) {
+		initStyle = SCE_ZIG_DEFAULT;
+	}
+
 	StyleContext sc(startPos, lengthDoc, initStyle, styler);
 
 	while (sc.More()) {
@@ -311,6 +316,8 @@ void LexerZig::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle
 		case SCE_ZIG_IDENTIFIER_STRING:
 			if (sc.atLineStart) {
 				sc.SetState(SCE_ZIG_DEFAULT);
+			} else if (sc.atLineEnd && sc.state != SCE_ZIG_MULTISTRING) {
+				sc.ChangeState(SCE_ZIG_STRINGEOL);
 			} else if (sc.ch == '\\' && sc.state != SCE_ZIG_MULTISTRING) {
 				escSeq.resetEscapeState(sc.state, sc.chNext);
 				sc.SetState(SCE_ZIG_ESCAPECHAR);
@@ -326,6 +333,12 @@ void LexerZig::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle
 			}
 			break;
 
+		case SCE_ZIG_STRINGEOL:
+			if (sc.atLineStart) {
+				sc.SetState(SCE_ZIG_DEFAULT);
+			}
+			break;
+
 		case SCE_ZIG_ESCAPECHAR:
 			if (escSeq.atEscapeEnd(sc.ch)) {
 				if (escSeq.brace && sc.ch == '}') {
diff --git a/test/examples/zig/AllStyles.zig b/test/examples/zig/AllStyles.zig
@@ -288,3 +288,7 @@ const Color = enum {
     @"really red",
 };
 const color: Color = .@"really red";
+
+const s1 = "Unterminated string
+const s2 = 'Unterminated character
+const s3 = @"Unterminated identifier string
diff --git a/test/examples/zig/AllStyles.zig.folded b/test/examples/zig/AllStyles.zig.folded
@@ -288,4 +288,8 @@
  0 401 401 |     @"really red",
  0 401 400 | };
  0 400 400   const color: Color = .@"really red";
+ 0 400 400   
+ 0 400 400   const s1 = "Unterminated string
+ 0 400 400   const s2 = 'Unterminated character
+ 0 400 400   const s3 = @"Unterminated identifier string
  0 400   0   
diff --git a/test/examples/zig/AllStyles.zig.styled b/test/examples/zig/AllStyles.zig.styled
@@ -288,3 +288,7 @@
     {17}@"really red"{5},{0}
 {5}};{0}
 {13}const{0} {10}color{5}:{0} {10}Color{0} {5}={0} {5}.{17}@"really red"{5};{0}
+
+{13}const{0} {10}s1{0} {5}={0} {18}"Unterminated string
+{13}const{0} {10}s2{0} {5}={0} {18}'Unterminated character
+{13}const{0} {10}s3{0} {5}={0} {18}@"Unterminated identifier string
