[JavaScript] Minor update line continuation handling.

zufuliu · Oct 9, 2024 · 2714853 · 2714853
1 parent 957001c
commit 2714853
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/scintilla/lexers/LexCoffeeScript.cxx b/scintilla/lexers/LexCoffeeScript.cxx
@@ -139,7 +139,7 @@ void ColouriseCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position lengthDoc, in
 		prevLineContinuation = (styler.GetLineState(sc.currentLine - 2) & PyLineStateLineContinuation) != 0;
 		lineState = styler.GetLineState(sc.currentLine - 1);
 		prevIndentCount = lineState >> 16;
-		lineContinuation= (lineState & PyLineStateLineContinuation) != 0;
+		lineContinuation = (lineState & PyLineStateLineContinuation) != 0;
 		lineState = 0;
 	}
 	if (startPos != 0 && IsSpaceEquiv(initStyle)) {

diff --git a/scintilla/lexers/LexHaskell.cxx b/scintilla/lexers/LexHaskell.cxx
@@ -87,7 +87,7 @@ void ColouriseHaskellDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int ini
 	if (sc.currentLine > 0) {
 		lineState = styler.GetLineState(sc.currentLine - 1);
 		commentLevel = (lineState >> 8) & 0xff;
-		lineContinuation= (lineState & PyLineStateLineContinuation) != 0;
+		lineContinuation = (lineState & PyLineStateLineContinuation) != 0;
 		lineState &= HaskellLineStatePragma;
 	}
 

diff --git a/scintilla/lexers/LexJavaScript.cxx b/scintilla/lexers/LexJavaScript.cxx
@@ -305,7 +305,9 @@ void ColouriseJsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 			}
 			if (sc.ch == '\\') {
 				if (IsEOLChar(sc.chNext)) {
-					lineContinuation = JsLineStateLineContinuation;
+					if (sc.state != SCE_JS_STRING_BT) {
+						lineContinuation = JsLineStateLineContinuation;
+					}
 				} else {
 					escSeq.resetEscapeState(sc.state, sc.chNext);
 					sc.SetState(SCE_JS_ESCAPECHAR);

diff --git a/scintilla/lexers/LexOCaml.cxx b/scintilla/lexers/LexOCaml.cxx
@@ -163,7 +163,7 @@ void ColouriseOCamlDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initS
 	if (sc.currentLine > 0) {
 		lineState = styler.GetLineState(sc.currentLine - 1);
 		commentLevel = (lineState >> 8) & 0xff;
-		lineContinuation= (lineState & PyLineStateLineContinuation) != 0;
+		lineContinuation = (lineState & PyLineStateLineContinuation) != 0;
 		lineState = 0;
 	}
 

diff --git a/scintilla/lexers/LexPHP.cxx b/scintilla/lexers/LexPHP.cxx
@@ -721,7 +721,9 @@ void PHPLexer::HighlightJsInnerString() {
 	}
 	if (sc.ch == '\\') {
 		if (IsEOLChar(sc.chNext)) {
-			lineContinuation = JsLineStateLineContinuation;
+			if (sc.state != js_style(SCE_JS_STRING_BT)) {
+				lineContinuation = JsLineStateLineContinuation;
+			}
 		} else {
 			escSeq.resetEscapeState(sc.state, sc.chNext);
 			sc.SetState(js_style(SCE_JS_ESCAPECHAR));
@@ -1339,7 +1341,7 @@ void ColourisePHPDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 					docTagState = DocTagState::None;
 					const int chNext = sc.chNext;
 					sc.SetState((chNext == '*') ? js_style(SCE_JS_COMMENTBLOCK) : js_style(SCE_JS_COMMENTLINE));
-					if (chNext== '*') {
+					if (chNext == '*') {
 						sc.Forward(2);
 						if (sc.ch == '*' && sc.chNext != '*') {
 							sc.ChangeState(js_style(SCE_JS_COMMENTBLOCKDOC));

diff --git a/scintilla/lexers/LexPython.cxx b/scintilla/lexers/LexPython.cxx
@@ -416,7 +416,7 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 		lineState = styler.GetLineState(sc.currentLine - 1);
 		parenCount = (lineState >> 8) & 0xff;
 		prevIndentCount = lineState >> 16;
-		lineContinuation= (lineState & PyLineStateLineContinuation) != 0;
+		lineContinuation = (lineState & PyLineStateLineContinuation) != 0;
 		lineState = 0;
 	}
 	if (startPos != 0 && IsSpaceEquiv(initStyle)) {