Minor fix for Python nested f-string highlighting.

zufuliu · May 19, 2023 · 85c9f0c · 85c9f0c
1 parent 9ad212f
commit 85c9f0c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scintilla/lexers/LexPython.cxx b/scintilla/lexers/LexPython.cxx
@@ -552,18 +552,18 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 
 			case '{':
 				if (IsPyString(sc.state)) {
-					if (sc.chNext == '{') {
+					if (sc.chNext == '{' && fstringPart == FormattedStringPart::None) {
 						escSeq.outerState = sc.state;
 						escSeq.digitsLeft = 1;
 						sc.SetState(SCE_PY_ESCAPECHAR);
 						sc.Forward();
 					} else if (IsPyFormattedString(sc.state)) {
 						if (nestedState.empty()) {
+							fstringPart = FormattedStringPart::None;
 							nestedState.push_back({sc.state, 1, 0});
 						} else {
 							nestedState.back().nestedLevel += 1;
 						}
-						fstringPart = FormattedStringPart::None;
 						sc.SetState(SCE_PY_OPERATOR2);
 						sc.ForwardSetState(SCE_PY_DEFAULT);
 					} else if (sc.chNext == '}' || sc.chNext == '!' || sc.chNext == ':' || IsIdentifierCharEx(sc.chNext)) {
@@ -582,14 +582,14 @@ void ColourisePyDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 							if (state.nestedLevel > 1) {
 								--state.nestedLevel;
 							} else {
+								fstringPart = FormattedStringPart::None;
 								nestedState.pop_back();
 							}
 						}
 						if (interpolating || sc.chNext != '}') {
 							const int state = sc.state;
 							sc.SetState(SCE_PY_OPERATOR2);
 							sc.ForwardSetState(state);
-							fstringPart = FormattedStringPart::None;
 							continue;
 						}
 					}