Fix the for of declarations

Fixes #232

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -11,7 +11,6 @@ patterns:
 repository:
   statements:
     patterns:
-    - include: '#for-in-simple'
     - include: '#string'
     - include: '#regex'
     - include: '#template'
@@ -32,7 +31,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.control.export.ts }
       '2': { name: storage.type.ts }
-    end: (?=$|;|})
+    end: (?=$|;|}|(\s+(of|in)\s+))
     patterns:
     - include: '#destructuring-variable'
     - include: '#var-single-variable'
@@ -43,11 +42,11 @@ repository:
     begin: ([_$[:alpha:]][_$[:alnum:]]*)
     beginCaptures:
       '1': { name: variable.other.readwrite.ts }
-    end: (?=$|[;,}])
+    end: (?=$|[;,}]|(\s+(of|in)\s+))
     patterns:
     - include: '#variable-initializer'
     - begin: \G
-      end: (?!\G)(?=$|[;,=}])
+      end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
       patterns:
       - include: '#type-annotation'
       - include: '#string'
@@ -56,14 +55,14 @@ repository:
   destructuring-variable:
     patterns:
     - name: meta.object-binding-pattern-variable.ts
-      begin: (?<!=|:)\s*(\{)
+      begin: (?<!=|:|of|in)\s*(\{)
       beginCaptures:
         '1': { name: punctuation.definition.binding-pattern.object.ts }
-      end: (?=$|[;,}])
+      end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
       - begin: \G
-        end: (?!\G)(?=$|[;,=}])
+        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
         - begin: \G
           end: \}
@@ -74,14 +73,14 @@ repository:
         - include: '#type-annotation'
         - include: '#comment'
     - name: meta.array-binding-pattern-variable.ts
-      begin: (?<!=|:)\s*(\[)
+      begin: (?<!=|:|of|in)\s*(\[)
       beginCaptures:
         '1': { name: punctuation.definition.binding-pattern.array.ts }
-      end: (?=$|[;,}])
+      end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
       - begin: \G
-        end: (?!\G)(?=$|[;,=}])
+        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
         - begin: \G
           end: \]
@@ -259,7 +258,7 @@ repository:
     - include: '#comment'
     - include: '#string'
     - name: entity.name.type.module.ts
-      match: \b([_$[:alpha:]][_$[:alnum:]]*)\b
+      match: ([_$[:alpha:]][_$[:alnum:]]*)
     - name: punctuation.accessor.ts
       match: \.      
 
@@ -881,15 +880,6 @@ repository:
     - include: '#switch-expression'
     - include: '#switch-block'
 
-  for-in-simple:
-    name: forin.expr.ts
-    match: (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b(?!\$)
-    captures:
-      '1': { name: storage.type.ts }
-      '2': { name: variable.other.readwrite.ts }
-      '3': { name: keyword.operator.in.ts }
-      '4': { name: keyword.operator.of.ts }
-
   function-call:
     name: functioncall.expr.ts
     patterns:

TypeScript.tmLanguage

@@ -878,7 +878,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;!=|:)\s*(\{)</string>
+					<string>(?&lt;!=|:|of|in)\s*(\{)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -888,7 +888,7 @@
 						</dict>
 					</dict>
 					<key>end</key>
-					<string>(?=$|[;,}])</string>
+					<string>(?=$|[;,}]|(\s+(of|in)\s+))</string>
 					<key>name</key>
 					<string>meta.object-binding-pattern-variable.ts</string>
 					<key>patterns</key>
@@ -901,7 +901,7 @@
 							<key>begin</key>
 							<string>\G</string>
 							<key>end</key>
-							<string>(?!\G)(?=$|[;,=}])</string>
+							<string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -939,7 +939,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;!=|:)\s*(\[)</string>
+					<string>(?&lt;!=|:|of|in)\s*(\[)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -949,7 +949,7 @@
 						</dict>
 					</dict>
 					<key>end</key>
-					<string>(?=$|[;,}])</string>
+					<string>(?=$|[;,}]|(\s+(of|in)\s+))</string>
 					<key>name</key>
 					<string>meta.array-binding-pattern-variable.ts</string>
 					<key>patterns</key>
@@ -962,7 +962,7 @@
 							<key>begin</key>
 							<string>\G</string>
 							<key>end</key>
-							<string>(?!\G)(?=$|[;,=}])</string>
+							<string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -1340,36 +1340,6 @@
 				</dict>
 			</array>
 		</dict>
-		<key>for-in-simple</key>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>storage.type.ts</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>variable.other.readwrite.ts</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.in.ts</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.of.ts</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?&lt;=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b(?!\$)</string>
-			<key>name</key>
-			<string>forin.expr.ts</string>
-		</dict>
 		<key>for-loop</key>
 		<dict>
 			<key>begin</key>
@@ -2186,7 +2156,7 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\b([_$[:alpha:]][_$[:alnum:]]*)\b</string>
+					<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
 					<key>name</key>
 					<string>entity.name.type.module.ts</string>
 				</dict>
@@ -3138,10 +3108,6 @@
 		<dict>
 			<key>patterns</key>
 			<array>
-				<dict>
-					<key>include</key>
-					<string>#for-in-simple</string>
-				</dict>
 				<dict>
 					<key>include</key>
 					<string>#string</string>
@@ -3870,7 +3836,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=$|;|})</string>
+			<string>(?=$|;|}|(\s+(of|in)\s+))</string>
 			<key>name</key>
 			<string>meta.var.expr.ts</string>
 			<key>patterns</key>
@@ -3902,7 +3868,7 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>(?=$|[;,}])</string>
+			<string>(?=$|[;,}]|(\s+(of|in)\s+))</string>
 			<key>name</key>
 			<string>meta.var-single-variable.expr.ts</string>
 			<key>patterns</key>
@@ -3915,7 +3881,7 @@
 					<key>begin</key>
 					<string>\G</string>
 					<key>end</key>
-					<string>(?!\G)(?=$|[;,=}])</string>
+					<string>(?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))</string>
 					<key>patterns</key>
 					<array>
 						<dict>

TypeScriptReact.YAML-tmLanguage

@@ -15,7 +15,6 @@ repository:
   statements:
     patterns:
     - include: '#jsx'
-    - include: '#for-in-simple'
     - include: '#string'
     - include: '#regex'
     - include: '#template'
@@ -36,7 +35,7 @@ repository:
     beginCaptures:
       '1': { name: keyword.control.export.tsx }
       '2': { name: storage.type.tsx }
-    end: (?=$|;|})
+    end: (?=$|;|}|(\s+(of|in)\s+))
     patterns:
     - include: '#destructuring-variable'
     - include: '#var-single-variable'
@@ -47,11 +46,11 @@ repository:
     begin: ([_$[:alpha:]][_$[:alnum:]]*)
     beginCaptures:
       '1': { name: variable.other.readwrite.tsx }
-    end: (?=$|[;,}])
+    end: (?=$|[;,}]|(\s+(of|in)\s+))
     patterns:
     - include: '#variable-initializer'
     - begin: \G
-      end: (?!\G)(?=$|[;,=}])
+      end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
       patterns:
       - include: '#type-annotation'
       - include: '#string'
@@ -60,14 +59,14 @@ repository:
   destructuring-variable:
     patterns:
     - name: meta.object-binding-pattern-variable.tsx
-      begin: (?<!=|:)\s*(\{)
+      begin: (?<!=|:|of|in)\s*(\{)
       beginCaptures:
         '1': { name: punctuation.definition.binding-pattern.object.tsx }
-      end: (?=$|[;,}])
+      end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
       - begin: \G
-        end: (?!\G)(?=$|[;,=}])
+        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
         - begin: \G
           end: \}
@@ -78,14 +77,14 @@ repository:
         - include: '#type-annotation'
         - include: '#comment'
     - name: meta.array-binding-pattern-variable.tsx
-      begin: (?<!=|:)\s*(\[)
+      begin: (?<!=|:|of|in)\s*(\[)
       beginCaptures:
         '1': { name: punctuation.definition.binding-pattern.array.tsx }
-      end: (?=$|[;,}])
+      end: (?=$|[;,}]|(\s+(of|in)\s+))
       patterns:
       - include: '#variable-initializer'
       - begin: \G
-        end: (?!\G)(?=$|[;,=}])
+        end: (?!\G)(?=$|[;,=}]|(\s+(of|in)\s+))
         patterns:
         - begin: \G
           end: \]
@@ -885,16 +884,6 @@ repository:
     - include: '#switch-expression'
     - include: '#switch-block'
 
-
-  for-in-simple:
-    name: forin.expr.tsx
-    match: (?<=\()\s*\b(var|let|const)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(?:(in)|(of))\b(?!\$)
-    captures:
-      '1': { name: storage.type.tsx }
-      '2': { name: variable.other.readwrite.tsx }
-      '3': { name: keyword.operator.in.tsx }
-      '4': { name: keyword.operator.of.tsx }
-
   function-call:
     name: functioncall.expr.tsx
     patterns: