Handle variable initializer in for in loop

Fixes #683

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -626,14 +626,14 @@ repository:
     - begin: (?<!=|!)(=)(?!=)(?=\s*\S)
       beginCaptures:
         '1': { name: keyword.operator.assignment.ts }
-      end: (?=$|^|[,);}\]])
+      end: (?=$|^|[,);}\]]|(\s+(of|in)\s+))
       patterns:
       - include: '#expression'
     # if the expression doesnt start on same line do not use end of line as end of unless the complete line is blank
     - begin: (?<!=|!)(=)(?!=)
       beginCaptures:
         '1': { name: keyword.operator.assignment.ts }
-      end: (?=[,);}\]])|(?=^\s*$)|(?<=\S)(?<!=)(?=\s*$)
+      end: (?=[,);}\]]|(\s+(of|in)\s+))|(?=^\s*$)|(?<=\S)(?<!=)(?=\s*$)
       patterns:
         - include: '#expression'
 

TypeScript.tmLanguage

@@ -1978,7 +1978,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[,);}\]])</string>
+            <string>(?=$|^|[,);}\]]|(\s+(of|in)\s+))</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -1999,7 +1999,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=[,);}\]])|(?=^\s*$)|(?&lt;=\S)(?&lt;!=)(?=\s*$)</string>
+            <string>(?=[,);}\]]|(\s+(of|in)\s+))|(?=^\s*$)|(?&lt;=\S)(?&lt;!=)(?=\s*$)</string>
             <key>patterns</key>
             <array>
               <dict>

TypeScriptReact.tmLanguage

@@ -1982,7 +1982,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[,);}\]])</string>
+            <string>(?=$|^|[,);}\]]|(\s+(of|in)\s+))</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -2003,7 +2003,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=[,);}\]])|(?=^\s*$)|(?&lt;=\S)(?&lt;!=)(?=\s*$)</string>
+            <string>(?=[,);}\]]|(\s+(of|in)\s+))|(?=^\s*$)|(?&lt;=\S)(?&lt;!=)(?=\s*$)</string>
             <key>patterns</key>
             <array>
               <dict>

tests/baselines/Issue683.baseline.txt

@@ -0,0 +1,72 @@
+original file
+-----------------------------------
+for (var i = 0 in collection) {
+    const x = 1; // Not classified
+}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>for (var i = 0 in collection) {
+ ^^^
+ source.ts keyword.control.loop.ts
+    ^
+    source.ts
+     ^
+     source.ts meta.brace.round.ts
+      ^^^
+      source.ts meta.var.expr.ts storage.type.ts
+         ^
+         source.ts meta.var.expr.ts
+          ^
+          source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+           ^
+           source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+            ^
+            source.ts meta.var.expr.ts keyword.operator.assignment.ts
+             ^
+             source.ts meta.var.expr.ts
+              ^
+              source.ts meta.var.expr.ts constant.numeric.decimal.ts
+               ^
+               source.ts
+                ^^
+                source.ts keyword.operator.expression.in.ts
+                  ^
+                  source.ts
+                   ^^^^^^^^^^
+                   source.ts variable.other.readwrite.ts
+                             ^
+                             source.ts meta.brace.round.ts
+                              ^
+                              source.ts
+                               ^
+                               source.ts meta.block.ts punctuation.definition.block.ts
+>    const x = 1; // Not classified
+ ^^^^
+ source.ts meta.block.ts
+     ^^^^^
+     source.ts meta.block.ts meta.var.expr.ts storage.type.ts
+          ^
+          source.ts meta.block.ts meta.var.expr.ts
+           ^
+           source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts
+            ^
+            source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+             ^
+             source.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
+              ^
+              source.ts meta.block.ts meta.var.expr.ts
+               ^
+               source.ts meta.block.ts meta.var.expr.ts constant.numeric.decimal.ts
+                ^
+                source.ts meta.block.ts punctuation.terminator.statement.ts
+                 ^
+                 source.ts meta.block.ts
+                  ^^
+                  source.ts meta.block.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+                    ^^^^^^^^^^^^^^^
+                    source.ts meta.block.ts comment.line.double-slash.ts
+>}
+ ^
+ source.ts meta.block.ts punctuation.definition.block.ts

tests/cases/Issue683.ts

@@ -0,0 +1,3 @@
+for (var i = 0 in collection) {
+    const x = 1; // Not classified
+}