Fix the variable initializer such that new lines are handled better.

If the expression starts on same line use end of line to end the scope
Otherwise do not use end of line as end of scope unless its complete blank line

TypeScript.YAML-tmLanguage

@@ -484,6 +484,7 @@ repository:
     - include: '#variable-initializer'
     - include: '#access-modifier'
     - include: '#property-accessor'
+    - include: '#after-operator-block'
     - include: '#decl-block'
     - include: '#expression'
     - include: '#punctuation-comma'
@@ -1021,12 +1022,21 @@ repository:
     - include: '#punctuation-comma'
 
   variable-initializer:
-    begin: (?<!=|!)(=)(?!=)
-    beginCaptures:
-      '1': { name: keyword.operator.assignment.ts }
-    end: (?=$|[,);}\]])
     patterns:
+    # if it is assignment with expression on same line, use end of line as end of scope
+    - begin: (?<!=|!)(=)(?!=)(?=\s*\S)
+      beginCaptures:
+        '1': { name: keyword.operator.assignment.ts }
+      end: (?=$|[,);}\]])
+      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*$)
+      patterns:
+        - include: '#expression'
 
   for-loop:
     begin: (?<!\.|\$)\b(for)(?:\s+(await))?\s*(\()

TypeScript.tmLanguage

@@ -1545,6 +1545,10 @@
             <key>include</key>
             <string>#property-accessor</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#after-operator-block</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#decl-block</string>
@@ -3104,23 +3108,49 @@
       </dict>
       <key>variable-initializer</key>
       <dict>
-        <key>begin</key>
-        <string>(?&lt;!=|!)(=)(?!=)</string>
-        <key>beginCaptures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.assignment.ts</string>
-          </dict>
-        </dict>
-        <key>end</key>
-        <string>(?=$|[,);}\]])</string>
         <key>patterns</key>
         <array>
           <dict>
-            <key>include</key>
-            <string>#expression</string>
+            <key>begin</key>
+            <string>(?&lt;!=|!)(=)(?!=)(?=\s*\S)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.assignment.ts</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=$|[,);}\]])</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#expression</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>begin</key>
+            <string>(?&lt;!=|!)(=)(?!=)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.assignment.ts</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=[,);}\]])|(?=^\s*$)</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#expression</string>
+              </dict>
+            </array>
           </dict>
         </array>
       </dict>

TypeScriptReact.tmLanguage

@@ -1549,6 +1549,10 @@
             <key>include</key>
             <string>#property-accessor</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#after-operator-block</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#decl-block</string>
@@ -3108,23 +3112,49 @@
       </dict>
       <key>variable-initializer</key>
       <dict>
-        <key>begin</key>
-        <string>(?&lt;!=|!)(=)(?!=)</string>
-        <key>beginCaptures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.assignment.tsx</string>
-          </dict>
-        </dict>
-        <key>end</key>
-        <string>(?=$|[,);}\]])</string>
         <key>patterns</key>
         <array>
           <dict>
-            <key>include</key>
-            <string>#expression</string>
+            <key>begin</key>
+            <string>(?&lt;!=|!)(=)(?!=)(?=\s*\S)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.assignment.tsx</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=$|[,);}\]])</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#expression</string>
+              </dict>
+            </array>
+          </dict>
+          <dict>
+            <key>begin</key>
+            <string>(?&lt;!=|!)(=)(?!=)</string>
+            <key>beginCaptures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.operator.assignment.tsx</string>
+              </dict>
+            </dict>
+            <key>end</key>
+            <string>(?=[,);}\]])|(?=^\s*$)</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#expression</string>
+              </dict>
+            </array>
           </dict>
         </array>
       </dict>

tests/baselines/Issue197.baseline.txt

@@ -159,101 +159,101 @@ Grammar: TypeScript.tmLanguage
                                             source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts
                                              ^
                                              source.ts meta.class.ts meta.field.declaration.ts keyword.operator.assignment.ts
-                                              ^^^
+                                              ^^^^
                                               source.ts meta.class.ts meta.field.declaration.ts
 >            [       
  ^^^^^^^^^^^^
- source.ts meta.class.ts
+ source.ts meta.class.ts meta.field.declaration.ts
              ^
-             source.ts meta.class.ts meta.array.literal.ts meta.brace.square.ts
+             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts
               ^^^^^^^^^
-              source.ts meta.class.ts meta.array.literal.ts
+              source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
 >                { statusText: "Assigned" },
  ^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.array.literal.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
                  ^
-                 source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                 source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                   ^
-                  source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts
+                  source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts
                    ^^^^^^^^^^
-                   source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
+                   source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
                              ^
-                             source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
+                             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
                               ^
-                              source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                              source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                ^
-                               source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+                               source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
                                 ^^^^^^^^
-                                source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
+                                source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
                                         ^
-                                        source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
+                                        source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
                                          ^
-                                         source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                                         source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                           ^
-                                          source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                                          source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                                            ^
-                                           source.ts meta.class.ts meta.array.literal.ts punctuation.separator.comma.ts
+                                           source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts
                                             ^^
-                                            source.ts meta.class.ts meta.array.literal.ts
+                                            source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
 >                { statusText: "Faulty" }, 
  ^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.array.literal.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
                  ^
-                 source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                 source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                   ^
-                  source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts
+                  source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts
                    ^^^^^^^^^^
-                   source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
+                   source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
                              ^
-                             source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
+                             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
                               ^
-                              source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                              source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                ^
-                               source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+                               source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
                                 ^^^^^^
-                                source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
+                                source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
                                       ^
-                                      source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
+                                      source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
                                        ^
-                                       source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                                       source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                         ^
-                                        source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                                        source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                                          ^
-                                         source.ts meta.class.ts meta.array.literal.ts punctuation.separator.comma.ts
+                                         source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts
                                           ^^^
-                                          source.ts meta.class.ts meta.array.literal.ts
+                                          source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
 >                { statusText: "Not in Use" },
  ^^^^^^^^^^^^^^^^
- source.ts meta.class.ts meta.array.literal.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
                  ^
-                 source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                 source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                   ^
-                  source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts
+                  source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts
                    ^^^^^^^^^^
-                   source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
+                   source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
                              ^
-                             source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
+                             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
                               ^
-                              source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                              source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                ^
-                               source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+                               source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.begin.ts
                                 ^^^^^^^^^^
-                                source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
+                                source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts
                                           ^
-                                          source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
+                                          source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts string.quoted.double.ts punctuation.definition.string.end.ts
                                            ^
-                                           source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
+                                           source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts meta.object.member.ts
                                             ^
-                                            source.ts meta.class.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
+                                            source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.objectliteral.ts punctuation.definition.block.ts
                                              ^
-                                             source.ts meta.class.ts meta.array.literal.ts punctuation.separator.comma.ts
+                                             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts punctuation.separator.comma.ts
                                               ^^
-                                              source.ts meta.class.ts meta.array.literal.ts
+                                              source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
 >            ];
  ^^^^^^^^^^^^
- source.ts meta.class.ts meta.array.literal.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts
              ^
-             source.ts meta.class.ts meta.array.literal.ts meta.brace.square.ts
+             source.ts meta.class.ts meta.field.declaration.ts meta.array.literal.ts meta.brace.square.ts
               ^
               source.ts meta.class.ts punctuation.terminator.statement.ts
                ^^

tests/baselines/Issue221.baseline.txt

@@ -39,25 +39,25 @@ Grammar: TypeScript.tmLanguage
              source.ts meta.class.ts meta.field.declaration.ts
               ^
               source.ts meta.class.ts meta.field.declaration.ts keyword.operator.assignment.ts
-               ^^
+               ^^^
                source.ts meta.class.ts meta.field.declaration.ts
 >    {"example":1};
  ^^^^
- source.ts meta.class.ts
+ source.ts meta.class.ts meta.field.declaration.ts
      ^
-     source.ts meta.class.ts meta.objectliteral.ts punctuation.definition.block.ts
+     source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts punctuation.definition.block.ts
       ^
-      source.ts meta.class.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+      source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts punctuation.definition.string.begin.ts
        ^^^^^^^
-       source.ts meta.class.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts
+       source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts
               ^
-              source.ts meta.class.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts punctuation.definition.string.end.ts
+              source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts string.quoted.double.ts punctuation.definition.string.end.ts
                ^
-               source.ts meta.class.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
+               source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
                 ^
-                source.ts meta.class.ts meta.objectliteral.ts meta.object.member.ts constant.numeric.decimal.ts
+                source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts meta.object.member.ts constant.numeric.decimal.ts
                  ^
-                 source.ts meta.class.ts meta.objectliteral.ts punctuation.definition.block.ts
+                 source.ts meta.class.ts meta.field.declaration.ts meta.objectliteral.ts punctuation.definition.block.ts
                   ^
                   source.ts meta.class.ts punctuation.terminator.statement.ts
                    ^^

tests/baselines/Issue250.baseline.txt

@@ -243,47 +243,47 @@ Grammar: TypeScript.tmLanguage
                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
                 ^
                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
-                 ^
+                 ^^
                  source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts
 >      type.defineField(DesignID.Fields, new Ordering(new FieldDesign));
  ^^^^^^
- source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+ source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts
        ^^^^
-       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
+       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts variable.other.object.ts
            ^
-           source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
+           source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts punctuation.accessor.ts
             ^^^^^^^^^^^
-            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts entity.name.function.ts
+            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts entity.name.function.ts
                        ^
-                       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
+                       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.brace.round.ts
                         ^^^^^^^^
-                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.object.ts
+                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts variable.other.object.ts
                                 ^
-                                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.accessor.ts
+                                source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts punctuation.accessor.ts
                                  ^^^^^^
-                                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts variable.other.property.ts
+                                 source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts variable.other.property.ts
                                        ^
-                                       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.separator.comma.ts
+                                       source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts punctuation.separator.comma.ts
                                         ^
-                                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts
+                                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts
                                          ^^^
-                                         source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts keyword.operator.new.ts
+                                         source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts keyword.operator.new.ts
                                             ^
-                                            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts
+                                            source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts
                                              ^^^^^^^^
-                                             source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
+                                             source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
                                                      ^
-                                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
+                                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
                                                       ^^^
-                                                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts new.expr.ts keyword.operator.new.ts
+                                                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts new.expr.ts keyword.operator.new.ts
                                                          ^
-                                                         source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts new.expr.ts
+                                                         source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts new.expr.ts
                                                           ^^^^^^^^^^^
-                                                          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts new.expr.ts entity.name.type.ts
+                                                          source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts new.expr.ts entity.name.type.ts
                                                                      ^
-                                                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
+                                                                     source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
                                                                       ^
-                                                                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.brace.round.ts
+                                                                      source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.brace.round.ts
                                                                        ^
                                                                        source.ts meta.class.ts meta.field.declaration.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
                                                                         ^^

tests/baselines/Issue375.baseline.txt

@@ -193,43 +193,45 @@ Grammar: TypeScript.tmLanguage
            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
 >    <Foo> {
  ^^^^
- source.ts cast.expr.ts
+ source.ts meta.var.expr.ts cast.expr.ts
      ^
-     source.ts cast.expr.ts meta.brace.angle.ts
+     source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
       ^^^
-      source.ts cast.expr.ts entity.name.type.ts
+      source.ts meta.var.expr.ts cast.expr.ts entity.name.type.ts
          ^
-         source.ts cast.expr.ts meta.brace.angle.ts
+         source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
           ^
-          source.ts
+          source.ts meta.var.expr.ts
            ^
-           source.ts meta.block.ts punctuation.definition.block.ts
+           source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
             ^^
-            source.ts meta.block.ts
+            source.ts meta.var.expr.ts meta.objectliteral.ts
 >        x: '3'
  ^^^^^^^^
- source.ts meta.block.ts
+ source.ts meta.var.expr.ts meta.objectliteral.ts
          ^
-         source.ts meta.block.ts variable.other.readwrite.ts
-          ^^
-          source.ts meta.block.ts
+         source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts
+          ^
+          source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
+           ^
+           source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
             ^
-            source.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+            source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.begin.ts
              ^
-             source.ts meta.block.ts string.quoted.single.ts
+             source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts string.quoted.single.ts
               ^
-              source.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts
+              source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts string.quoted.single.ts punctuation.definition.string.end.ts
                ^^
-               source.ts meta.block.ts
+               source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
 >    };
  ^^^^
- source.ts meta.block.ts
+ source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
      ^
-     source.ts meta.block.ts punctuation.definition.block.ts
+     source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
       ^
       source.ts punctuation.terminator.statement.ts
        ^^

tests/baselines/TsxSamples.baseline.txt

@@ -198,86 +198,86 @@ Grammar: TypeScriptReact.tmLanguage
          source.tsx meta.var.expr.tsx keyword.operator.assignment.tsx
 >    <Form>
  ^^^^
- source.tsx
+ source.tsx meta.var.expr.tsx
      ^
-     source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+     source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
       ^^^^
-      source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
+      source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
           ^
-          source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+          source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
 >        <FormRow>
  ^^^^^^^^
- source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
+ source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
          ^
-         source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+         source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
           ^^^^^^^
-          source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
+          source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
                  ^
-                 source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                 source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
 >            <FormLabel data="1" />
  ^^^^^^^^^^^^
- source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
+ source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
              ^
-             source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
+             source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
               ^^^^^^^^^
-              source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx
+              source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx
                        ^
-                       source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
+                       source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
                         ^^^^
-                        source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx
+                        source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx
                             ^
-                            source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx keyword.operator.assignment.tsx
+                            source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx keyword.operator.assignment.tsx
                              ^
-                             source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx
+                             source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx
                               ^
-                              source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx
+                              source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx
                                ^
-                               source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx
+                               source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx
                                 ^
-                                source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
+                                source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
                                  ^^
-                                 source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.end.tsx
+                                 source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.end.tsx
 >            <FormInput data="2" />
  ^^^^^^^^^^^^
- source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
+ source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
              ^
-             source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
+             source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
               ^^^^^^^^^
-              source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx
+              source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx
                        ^
-                       source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
+                       source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
                         ^^^^
-                        source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx
+                        source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx
                             ^
-                            source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx keyword.operator.assignment.tsx
+                            source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx keyword.operator.assignment.tsx
                              ^
-                             source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx
+                             source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx
                               ^
-                              source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx
+                              source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx
                                ^
-                               source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx
+                               source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx
                                 ^
-                                source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
+                                source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx
                                  ^^
-                                 source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.end.tsx
+                                 source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.end.tsx
 >        </FormRow>
  ^^^^^^^^
- source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
+ source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
          ^^
-         source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+         source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
            ^^^^^^^
-           source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
+           source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
                   ^
-                  source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                  source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
 >    </Form>
  ^^^^
- source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
+ source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx
      ^^
-     source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+     source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
        ^^^^
-       source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
+       source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx
            ^
-           source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+           source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
 >
  ^
  source.tsx

tests/baselines/TsxSamples.txt

@@ -82,42 +82,42 @@ Grammar: TypeScriptReact.tmLanguage
 >var App =
 >    <Form>
      ^
-     [13, 5]: source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
+     [13, 5]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
       ^^^^
-      [13, 6]: source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
+      [13, 6]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
 >        <FormRow>
          ^
-         [14, 9]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
+         [14, 9]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
           ^^^^^^^
-          [14, 10]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
+          [14, 10]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
 >            <FormLabel data="1" />
              ^
-             [15, 13]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx 
+             [15, 13]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx 
               ^^^^^^^^^
-              [15, 14]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx 
+              [15, 14]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx 
                         ^^^^
-                        [15, 24]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx 
+                        [15, 24]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx 
                               ^
-                              [15, 30]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx 
+                              [15, 30]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx 
 >            <FormInput data="2" />
              ^
-             [16, 13]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx 
+             [16, 13]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx 
               ^^^^^^^^^
-              [16, 14]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx 
+              [16, 14]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.name.tag.tsx 
                         ^^^^
-                        [16, 24]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx 
+                        [16, 24]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx entity.other.attribute-name.tsx 
                               ^
-                              [16, 30]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx 
+                              [16, 30]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.tsx string.quoted.double.tsx 
 >        </FormRow>
          ^^
-         [17, 9]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
+         [17, 9]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
            ^^^^^^^
-           [17, 11]: source.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
+           [17, 11]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
 >    </Form>
      ^^
-     [18, 5]: source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
+     [18, 5]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx 
        ^^^^
-       [18, 7]: source.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
+       [18, 7]: source.tsx meta.var.expr.tsx meta.tag.without-attributes.tsx entity.name.tag.tsx 
 >
 >var App2 = (
 >    <Form>