diff --git a/extensions/json/package.json b/extensions/json/package.json
index 983a0480e4b..224e446f8a0 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -11,7 +11,7 @@
"mimetypes": ["application/json"]
}],
"grammars": [{
- // "language": "json" : commented out for now
+ "language": "json",
"scopeName": "source.json",
"path": "./syntaxes/JSON.tmLanguage"
}]
diff --git a/extensions/json/syntaxes/JSON.tmLanguage b/extensions/json/syntaxes/JSON.tmLanguage
index 539d1416cbd..9d6a24cc16a 100644
--- a/extensions/json/syntaxes/JSON.tmLanguage
+++ b/extensions/json/syntaxes/JSON.tmLanguage
@@ -206,7 +206,7 @@
comment
the JSON object key
include
- #string
+ #objectkey
include
@@ -283,6 +283,48 @@
name
string.quoted.double.json
+ patterns
+
+
+ include
+ #stringcontent
+
+
+
+ objectkey
+
+ begin
+ "
+ beginCaptures
+
+ 0
+
+ name
+ punctuation.support.type.property-name.begin.json
+
+
+ end
+ "
+ endCaptures
+
+ 0
+
+ name
+ punctuation.support.type.property-name.end.json
+
+
+ name
+ support.type.property-name.json
+ patterns
+
+
+ include
+ #stringcontent
+
+
+
+ stringcontent
+
patterns