Fix WebAssembly nested comment highlighting.

zufuliu · Aug 16, 2023 · f3d0372 · f3d0372
1 parent 31dc208
commit f3d0372
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scintilla/lexers/LexBash.cxx b/scintilla/lexers/LexBash.cxx
@@ -534,7 +534,7 @@ void ColouriseBashDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
 			}
 			break;
 		case SCE_SH_IDENTIFIER:
-			if (sc.chPrev == '\\' || !IsBashWordChar(sc.ch, cmdState)) {
+			if (!IsBashWordChar(sc.ch, cmdState)) {
 				sc.SetState(SCE_SH_DEFAULT);
 			}
 			break;

diff --git a/scintilla/lexers/LexWASM.cxx b/scintilla/lexers/LexWASM.cxx
@@ -72,7 +72,7 @@ void ColouriseWASMDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 		1: lineStateLineComment
 		8: commentLevel
 		*/
-		commentLevel = (lineState >> 1) & 0xff;
+		commentLevel = lineState >> 1;
 	}
 
 	while (sc.More()) {
@@ -192,7 +192,7 @@ void ColouriseWASMDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 			++visibleChars;
 		}
 		if (sc.atLineEnd) {
-			const int lineState = commentLevel | lineStateLineComment;
+			const int lineState = (commentLevel << 1) | lineStateLineComment;
 			styler.SetLineState(sc.currentLine, lineState);
 			visibleChars = 0;
 			lineStateLineComment = 0;