Refactoring LookbackNonWhite(), especially for PHP lexer.

zufuliu · Mar 30, 2023 · 7849b30 · 7849b30
1 parent 89f1a9f
commit 7849b30
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 23 deletions.
diff --git a/scintilla/lexers/LexCSharp.cxx b/scintilla/lexers/LexCSharp.cxx
@@ -238,8 +238,7 @@ void ColouriseCSharpDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int init
 			lineStateLineType = CSharpLineStateMaskLineComment;
 		}
 	} else if (IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_CSHARP_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_CSHARP_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_CSHARP_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexers/LexD.cxx b/scintilla/lexers/LexD.cxx
@@ -320,8 +320,7 @@ void ColouriseDDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle
 			lineStateLineType = DLineStateMaskLineComment;
 		}
 	} else if (IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_D_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_D_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_D_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexers/LexDart.cxx b/scintilla/lexers/LexDart.cxx
@@ -123,8 +123,7 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 			lineStateLineType = DartLineStateMaskLineComment;
 		}
 	} else if (IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_DART_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_DART_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_DART_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexers/LexGo.cxx b/scintilla/lexers/LexGo.cxx
@@ -266,8 +266,7 @@ void ColouriseGoDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 
 	StyleContext sc(startPos, lengthDoc, initStyle, styler);
 	if (startPos != 0 && IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_GO_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_GO_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_GO_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	Sci_Position identifierStartPos = 0;

diff --git a/scintilla/lexers/LexJava.cxx b/scintilla/lexers/LexJava.cxx
@@ -203,8 +203,7 @@ void ColouriseJavaDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 			lineStateLineType = JavaLineStateMaskLineComment;
 		}
 	} else if (IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_JAVA_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_JAVA_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_JAVA_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexers/LexPHP.cxx b/scintilla/lexers/LexPHP.cxx
@@ -853,11 +853,19 @@ void ColourisePHPDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSty
 			sc.SetState(SCE_PHP_COMMENTLINE);
 			sc.Forward();
 		}
-	} else if (IsJsSpaceEquiv(initStyle)) {
+	} else {
+		unsigned marker = SCE_H_DEFAULT;
 		// look back for better regex colouring
-		LookbackNonWhite(styler, startPos, js_style(SCE_JS_TASKMARKER), chPrevNonWhite, stylePrevNonWhite);
-	} else if (IsCssSpaceEquiv(initStyle)) {
-		LookbackNonWhite(styler, startPos, css_style(SCE_CSS_CDO_CDC), chPrevNonWhite, stylePrevNonWhite);
+		if (IsJsSpaceEquiv(initStyle)) {
+			marker = (js_style(SCE_JS_DEFAULT) << 8) | js_style(SCE_JS_TASKMARKER);
+		} else if (IsCssSpaceEquiv(initStyle)) {
+			marker = (css_style(SCE_CSS_DEFAULT) << 8) | css_style(SCE_CSS_CDO_CDC);
+		} else if (IsSpaceEquiv(initStyle)) {
+			marker = (SCE_PHP_DEFAULT << 8) | SCE_PHP_TASKMARKER;
+		}
+		if (marker != SCE_H_DEFAULT) {
+			LookbackNonWhite(styler, startPos, marker, chPrevNonWhite, stylePrevNonWhite);
+		}
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexers/LexPython.cxx b/scintilla/lexers/LexPython.cxx
@@ -384,7 +384,6 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 	int visibleCharsBefore = 0;
 	int chBefore = 0;
 	int chPrevNonWhite = 0;
-	int stylePrevNonWhite = SCE_PY_DEFAULT;
 	int prevIndentCount = 0;
 	int indentCount = 0;
 	int parenCount = 0;
@@ -413,7 +412,7 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 	}
 	if (startPos != 0 && IsSpaceEquiv(initStyle)) {
 		// look back for better dict key colouring
-		LookbackNonWhite(styler, startPos, SCE_PY_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_PY_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {
@@ -834,7 +833,6 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 			visibleChars++;
 			if (!IsSpaceEquiv(sc.state)) {
 				chPrevNonWhite = sc.ch;
-				stylePrevNonWhite = sc.state;
 			}
 		}
 		if (sc.atLineEnd) {

diff --git a/scintilla/lexers/LexVHDL.cxx b/scintilla/lexers/LexVHDL.cxx
@@ -77,8 +77,7 @@ void ColouriseVHDLDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
 		lineState &= VHDLLineStateMaskAttribute | VHDLLineStateMaskCodeFolding;
 	}
 	if (startPos != 0 && IsSpaceEquiv(initStyle)) {
-		int stylePrevNonWhite = SCE_VHDL_DEFAULT;
-		LookbackNonWhite(styler, startPos, SCE_VHDL_TASKMARKER, chPrevNonWhite, stylePrevNonWhite);
+		LookbackNonWhite(styler, startPos, SCE_VHDL_TASKMARKER, chPrevNonWhite, initStyle);
 	}
 
 	while (sc.More()) {

diff --git a/scintilla/lexlib/LexAccessor.cxx b/scintilla/lexlib/LexAccessor.cxx
@@ -247,15 +247,20 @@ void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &s
 	}
 }
 
-Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int maxSpaceStyle, int &chPrevNonWhite, int &stylePrevNonWhite) noexcept {
-	 do {
+Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, unsigned maxSpaceStyle, int &chPrevNonWhite, int &stylePrevNonWhite) noexcept {
+	const unsigned startStyle = maxSpaceStyle >> 8;
+	maxSpaceStyle &= 0xff;
+	do {
 		--startPos;
-		const int style = styler.StyleAt(startPos);
+		const unsigned style = styler.StyleAt(startPos);
 		if (style > maxSpaceStyle) {
 			stylePrevNonWhite = style;
 			chPrevNonWhite = static_cast<unsigned char>(styler[startPos]);
 			break;
 		}
+		if (style < startStyle) {
+			break;
+		}
 	} while (startPos != 0);
 	return startPos;
 }

diff --git a/scintilla/lexlib/LexAccessor.h b/scintilla/lexlib/LexAccessor.h
@@ -348,7 +348,7 @@ inline int GetMatchedDelimiterCount(LexAccessor &styler, Sci_PositionU pos, int
 }
 
 void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle) noexcept;
-Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, int maxSpaceStyle, int &chPrevNonWhite, int &stylePrevNonWhite) noexcept;
+Sci_PositionU LookbackNonWhite(LexAccessor &styler, Sci_PositionU startPos, unsigned maxSpaceStyle, int &chPrevNonWhite, int &stylePrevNonWhite) noexcept;
 Sci_PositionU CheckBraceOnNextLine(LexAccessor &styler, Sci_Line line, int operatorStyle, int maxSpaceStyle, int ignoreStyle = 0) noexcept;
 
 }