From f924875c005e65766d7cb90b29131b73ca73a44a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 25 Nov 2015 12:00:58 +0100
Subject: [PATCH] [json] improve text mate tokenizer, enable as default

---
 extensions/json/package.json             |  2 +-
 extensions/json/syntaxes/JSON.tmLanguage | 44 +++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

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 @@
 					<key>comment</key>
 					<string>the JSON object key</string>
 					<key>include</key>
-					<string>#string</string>
+					<string>#objectkey</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -283,6 +283,48 @@
 			</dict>
 			<key>name</key>
 			<string>string.quoted.double.json</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#stringcontent</string>
+				</dict>
+			</array>
+		</dict>
+		<key>objectkey</key>
+		<dict>
+			<key>begin</key>
+			<string>"</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.support.type.property-name.begin.json</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>"</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>0</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.support.type.property-name.end.json</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>support.type.property-name.json</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#stringcontent</string>
+				</dict>
+			</array>
+		</dict>
+		<key>stringcontent</key>
+		<dict>
 			<key>patterns</key>
 			<array>
 				<dict>