Improve Batch variable highlighting on error, issue #332.

zufuliu · Jun 23, 2021 · 9164ccd · 9164ccd
1 parent cfb6eda
commit 9164ccd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/scintilla/lexers/LexBatch.cxx b/scintilla/lexers/LexBatch.cxx
@@ -152,7 +152,7 @@ constexpr bool IsTildeExpansion(int ch) noexcept {
 
 bool DetectBatchVariable(StyleContext &sc, int &outerStyle, int &varQuoteChar) {
 	varQuoteChar = '\0';
-	if (!IsGraphic(sc.chNext) || sc.chNext == '!' || (sc.ch == '!' && sc.chNext == '%')) {
+	if (!IsGraphic(sc.chNext) || (sc.ch == '!' && (sc.chNext == '%' || sc.chNext == '!'))) {
 		return false;
 	}
 
@@ -163,7 +163,7 @@ bool DetectBatchVariable(StyleContext &sc, int &outerStyle, int &varQuoteChar) {
 		return true;
 	}
 	if (sc.chNext == '*' || IsADigit(sc.chNext)) {
-		// %*, %1 ... %9
+		// %*, %0 ... %9
 		sc.Forward();
 	} else if (sc.chNext == '~' || sc.chNext == '%') {
 		sc.Forward();
@@ -254,7 +254,7 @@ void ColouriseBatchDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
 			break;
 
 		case SCE_BAT_IDENTIFIER:
-			if (sc.ch == '.' && sc.LengthCurrent() == 4 && sc.styler.MatchIgnoreCase(sc.styler.GetStartSegment(), "echo")) {
+			if (sc.ch == '.' && sc.LengthCurrent() == 4 && styler.MatchIgnoreCase(styler.GetStartSegment(), "echo")) {
 				parenBefore = parenCount;
 				command = Command::Echo;
 				sc.ChangeState(SCE_BAT_WORD);
@@ -334,8 +334,10 @@ void ColouriseBatchDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
 					varQuoteChar = '\0';
 					sc.Forward();
 				} else if (IsEOLChar(sc.ch) || sc.ch == GetStringQuote(outerStyle)) {
-					// something went wrong
+					// something went wrong, e.g. ! without EnableDelayedExpansion.
 					varQuoteChar = '\0';
+					sc.ChangeState(outerStyle);
+					sc.Rewind();
 				}
 			}
 			if (varQuoteChar == '\0') {

diff --git a/scintilla/lexlib/StyleContext.h b/scintilla/lexlib/StyleContext.h
@@ -234,6 +234,18 @@ class StyleContext final {
 		styler.GetRangeLowered(styler.GetStartSegment(), currentPos, s, len);
 	}
 
+	void Rewind() noexcept {
+		currentPos = styler.GetStartSegment();
+		chPrev = 0;
+		if (!multiByteAccess) {
+			ch = static_cast<unsigned char>(styler[currentPos]);
+		} else {
+			ch =  styler.GetCharacterAndWidth(currentPos, &widthNext);
+			width = widthNext;
+		}
+		Forward();
+	}
+
 	bool LineEndsWith(char ch0) const noexcept {
 		return chPrev == static_cast<unsigned char>(ch0)
 			|| (chPrev == '\r' && ch == '\n' && currentPos >= 2 && ch0 == styler[currentPos - 2]);