Support JSON property without double quotes.

zufuliu · Dec 17, 2018 · ed49db6 · ed49db6
1 parent 77acd8c
commit ed49db6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/scintilla/lexers/LexJSON.cxx b/scintilla/lexers/LexJSON.cxx
@@ -77,6 +77,16 @@ static void ColouriseJSONDoc(Sci_PositionU startPos, Sci_Position length, int in
 				buf[wordLen] = 0;
 				if (strcmp(buf, "true") == 0 || strcmp(buf, "false") == 0 || strcmp(buf, "null") == 0) {
 					styler.ColourTo(i - 1, SCE_C_WORD);
+				} else if (ch == ':' || IsASpace(ch)) {
+					bool isProp = ch == ':' || chNext == ':';
+					if (!isProp) {
+						Sci_PositionU pos = i + 1;
+						while (IsASpace(styler.SafeGetCharAt(pos++)));
+						isProp = styler[pos - 1] == ':';
+					}
+					if (isProp) {
+						styler.ColourTo(i - 1, SCE_C_LABEL);
+					}
 				}
 				state = SCE_C_DEFAULT;
 				wordLen = 0;

diff --git a/src/EditLexers/EditStyle.h b/src/EditLexers/EditStyle.h
@@ -32,7 +32,6 @@
 #define NP2STYLE_XMLIdentifier		63149
 #define NP2STYLE_XMLSGML			63150
 #define NP2STYLE_XMLCDATA			63151
-#define NP2STYLE_JSONKey			63152
 //63161-63300 Web
 //63301-63320 CSS
 #define NP2STYLE_Class				63320

diff --git a/src/EditLexers/stlJSON.c b/src/EditLexers/stlJSON.c
@@ -13,7 +13,7 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 static EDITSTYLE Styles_JSON[] = {
 	EDITSTYLE_DEFAULT,
 	{ SCE_C_WORD, NP2STYLE_Keyword, EDITSTYLE_HOLE(L"Keyword"), L"fore:#0000FF" },
-	{ SCE_C_LABEL, NP2STYLE_JSONKey, EDITSTYLE_HOLE(L"Key"), L"fore:#A46000" },
+	{ SCE_C_LABEL, NP2STYLE_Property, EDITSTYLE_HOLE(L"Property"), L"fore:#A46000" },
 	{ SCE_C_STRING, NP2STYLE_String, EDITSTYLE_HOLE(L"String"), L"fore:#008000" },
 	{ SCE_C_NUMBER, NP2STYLE_Number, EDITSTYLE_HOLE(L"Number"), L"fore:#FF0000" },
 	{ SCE_C_OPERATOR, NP2STYLE_Operator, EDITSTYLE_HOLE(L"Operator"), L"fore:#B000B0" },