[Rust] Highlight (raw) C string literals.

zufuliu · Aug 25, 2024 · 25dcd80 · 25dcd80
1 parent 00149c9
commit 25dcd80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/scintilla/lexers/LexAviSynth.cxx b/scintilla/lexers/LexAviSynth.cxx
@@ -211,7 +211,7 @@ void ColouriseAvsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 					insideScript = 0;
 				}
 			} else if (sc.Match('e', '\"')) {
-				// Avisynth+ 3.6 escaped string
+				// AviSynth+ 3.6 escaped string
 				sc.SetState(SCE_AVS_ESCAPESTRING);
 				sc.Forward();
 			} else if (IsNumberStart(sc.ch, sc.chNext) || (sc.ch == '$' && IsHexDigit(sc.chNext))) {

diff --git a/scintilla/lexers/LexRust.cxx b/scintilla/lexers/LexRust.cxx
@@ -451,16 +451,16 @@ void ColouriseRustDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 				hashCount = 0;
 				sc.SetState(SCE_RUST_RAW_STRING);
 				sc.Forward();
-			} else if (sc.Match('b', '\"')) {
-				sc.SetState(SCE_RUST_BYTESTRING);
-				sc.Forward();
-			} else if (sc.Match('b', '\'')) {
-				sc.SetState(SCE_RUST_BYTE_CHARACTER);
-				sc.Forward();
-			} else if (sc.Match('b', 'r')) {
-				if (IsRustRawString(styler, sc.currentPos + 2, true, hashCount)) {
-					sc.SetState(SCE_RUST_RAW_BYTESTRING);
+			} else if (sc.ch == 'b' || sc.ch == 'c') {
+				if (sc.chNext == '\"') {
+					sc.SetState((sc.ch == 'b') ? SCE_RUST_BYTESTRING : SCE_RUST_STRING);
+					sc.Forward();
+				} else if (sc.chNext == 'r' && IsRustRawString(styler, sc.currentPos + 2, true, hashCount)) {
+					sc.SetState((sc.ch == 'b') ? SCE_RUST_RAW_BYTESTRING : SCE_RUST_RAW_STRING);
 					sc.Advance(hashCount + 2);
+				} else if (sc.Match('b', '\'')) {
+					sc.SetState(SCE_RUST_BYTE_CHARACTER);
+					sc.Forward();
 				} else {
 					if (sc.chPrev != '.') {
 						chBeforeIdentifier = sc.chPrev;