Merge pull request #24 from Microsoft/i21

Fix syntax issue when object members have the same name with a keyword

Author: zhengbli

TypeScript.YAML-tmLanguage

@@ -230,8 +230,8 @@ repository:
     endCaptures:
       '0': { name: meta.brace.curly.ts }
     patterns:
-    - include: '#expression'
     - include: '#object-member'
+    - include: '#expression'
 
   decl-block:
     name: meta.decl.block.ts

TypeScript.tmLanguage

@@ -105,11 +105,11 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#expression</string>
+					<string>#object-member</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-member</string>
+					<string>#expression</string>
 				</dict>
 			</array>
 		</dict>

TypeScriptReact.YAML-tmLanguage

@@ -231,8 +231,8 @@ repository:
     endCaptures:
       '0': { name: meta.brace.curly.tsx }
     patterns:
-    - include: '#expression'
     - include: '#object-member'
+    - include: '#expression'
 
   decl-block:
     name: meta.decl.block.tsx

TypeScriptReact.tmLanguage

@@ -98,11 +98,11 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#expression</string>
+					<string>#object-member</string>
 				</dict>
 				<dict>
 					<key>include</key>
-					<string>#object-member</string>
+					<string>#expression</string>
 				</dict>
 			</array>
 		</dict>