[JavaScript] Highlight .get(), .set(), .delete(), etc. as funct…

…ion call instead of keyword.
zufuliu · May 12, 2024 · 604b553 · 604b553
1 parent cc6a5b6
commit 604b553
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scintilla/lexers/LexJavaScript.cxx b/scintilla/lexers/LexJavaScript.cxx
@@ -231,10 +231,13 @@ void ColouriseJsDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyl
 						} else if (StrEqualsAny(s, "return", "yield")) {
 							kwType = KeywordType::Return;
 						}
-						if (kwType > KeywordType::None && kwType < KeywordType::Return) {
+						if (chBefore == '.' || (kwType > KeywordType::None && kwType < KeywordType::Return)) {
 							const int chNext = sc.GetLineNextChar();
 							if (!(IsJsIdentifierStart(chNext) || chNext == '\\')) {
 								kwType = KeywordType::None;
+								if (chBefore == '.' && chNext == '(') {
+									sc.ChangeState(SCE_JS_FUNCTION);
+								}
 							}
 						}
 					} else if (keywordLists[KeywordIndex_FutureReservedWord].InList(s)) {

diff --git a/src/Bridge.cpp b/src/Bridge.cpp
@@ -1101,7 +1101,7 @@ std::string CodePretty(LPCEDITLEXER pLex, const char *styledText, size_t textLen
 			} else if ((stylePrev == SCE_CSS_AT_RULE && pLex->iLexer == SCLEX_CSS)
 				|| (stylePrev == SCE_JS_WORD && pLex->iLexer == SCLEX_JAVASCRIPT
 					&& (style <= SCE_JS_OPERATOR_PF || ch == '{' || ch == '[' || ch == '!' || ch == '~' || (ch == '(' && chPrev != 't')))) {
-				// not set(), get(); TODO: handle function(), delete()
+				// not set(), get();
 				spaceOption |= SpaceOption_SpaceBefore;
 			}
 		}