Jsx tag start depends on surrounding context

Fixes #268

TypeScriptReact.YAML-tmLanguage

@@ -120,35 +120,47 @@ repository:
     - include: '#jsx-children'
 
   jsx-tag:
-    name: meta.tag.tsx
+    # We need to differentiate between the relational '<' operator and the beginning of a tag using the surrounding context.
     begin: >-
       (?x)
-        (<)
+        (?<=[({\[,?=>]|&&|\|\||\?|\Wreturn|^return|\Wdefault|^)\s*
+        (?!(<)([_$a-zA-Z][-$\w.]*(?<!\.|-))(>)) #look ahead is not start of tag without attributes
+        (?!<[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s+[^=>])|,)) # look ahead is not type parameter of arrow
+        (?=(<)
         ([_$a-zA-Z][-$\w.]*(?<!\.|-))
-        (?=\s+(?!\?)|/?>)
-    beginCaptures:
-      '1': { name: punctuation.definition.tag.begin.tsx }
-      '2': { name: entity.name.tag.tsx }
+        (?=\s+(?!\?)|/?>))
     end: (/>)|(?:(</)([_$a-zA-Z][-$\w.]*(?<!\.|-))\s*(>))
     endCaptures:
+      '0': { name: meta.tag.tsx }
       '1': { name: punctuation.definition.tag.end.tsx }
       '2': { name: punctuation.definition.tag.begin.tsx }
       '3': { name: entity.name.tag.tsx }
       '4': { name: punctuation.definition.tag.end.tsx }
     patterns:
-    - begin: \G(?![/]?>)
-      end: (?=[/]?>)
-      patterns:
-      - include: '#comment'
-      - include: '#jsx-tag-attributes'
-      - include: '#jsx-tag-attributes-illegal'
-    - begin: (>)
+    - name: meta.tag.tsx
+      begin: >-
+        (?x)
+          (<)
+          ([_$a-zA-Z][-$\w.]*(?<!\.|-))
+          (?=\s+(?!\?)|/?>)
       beginCaptures:
-        '1': { name: punctuation.definition.tag.end.tsx }
-      end: (?=</)
-      contentName: meta.jsx.children.tsx
+        '1': { name: punctuation.definition.tag.begin.tsx }
+        '2': { name: entity.name.tag.tsx }
+      end: (?=(/>)|(?:(</)([_$a-zA-Z][-$\w.]*(?<!\.|-))\s*(>)))
       patterns:
-      - include: '#jsx-children'
+      - begin: \G(?![/]?>)
+        end: (?=[/]?>)
+        patterns:
+        - include: '#comment'
+        - include: '#jsx-tag-attributes'
+        - include: '#jsx-tag-attributes-illegal'
+      - begin: (>)
+        beginCaptures:
+          '1': { name: punctuation.definition.tag.end.tsx }
+        end: (?=</)
+        contentName: meta.jsx.children.tsx
+        patterns:
+        - include: '#jsx-children'
 
   jsx-tag-invalid:
     name: invalid.illegal.tag.incomplete.tsx

TypeScriptReact.tmLanguage

@@ -4527,30 +4527,23 @@
       </dict>
       <key>jsx-tag</key>
       <dict>
-        <key>name</key>
-        <string>meta.tag.tsx</string>
         <key>begin</key>
         <string>(?x)
-  (&lt;)
+  (?&lt;=[({\[,?=&gt;]|&amp;&amp;|\|\||\?|\Wreturn|^return|\Wdefault|^)\s*
+  (?!(&lt;)([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))(&gt;)) #look ahead is not start of tag without attributes
+  (?!&lt;[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s+[^=&gt;])|,)) # look ahead is not type parameter of arrow
+  (?=(&lt;)
   ([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))
-  (?=\s+(?!\?)|/?&gt;)</string>
-        <key>beginCaptures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.tag.begin.tsx</string>
-          </dict>
-          <key>2</key>
-          <dict>
-            <key>name</key>
-            <string>entity.name.tag.tsx</string>
-          </dict>
-        </dict>
+  (?=\s+(?!\?)|/?&gt;))</string>
         <key>end</key>
         <string>(/&gt;)|(?:(&lt;/)([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))\s*(&gt;))</string>
         <key>endCaptures</key>
         <dict>
+          <key>0</key>
+          <dict>
+            <key>name</key>
+            <string>meta.tag.tsx</string>
+          </dict>
           <key>1</key>
           <dict>
             <key>name</key>
@@ -4575,46 +4568,73 @@
         <key>patterns</key>
         <array>
           <dict>
+            <key>name</key>
+            <string>meta.tag.tsx</string>
             <key>begin</key>
-            <string>\G(?![/]?&gt;)</string>
-            <key>end</key>
-            <string>(?=[/]?&gt;)</string>
-            <key>patterns</key>
-            <array>
-              <dict>
-                <key>include</key>
-                <string>#comment</string>
-              </dict>
-              <dict>
-                <key>include</key>
-                <string>#jsx-tag-attributes</string>
-              </dict>
-              <dict>
-                <key>include</key>
-                <string>#jsx-tag-attributes-illegal</string>
-              </dict>
-            </array>
-          </dict>
-          <dict>
-            <key>begin</key>
-            <string>(&gt;)</string>
+            <string>(?x)
+  (&lt;)
+  ([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))
+  (?=\s+(?!\?)|/?&gt;)</string>
             <key>beginCaptures</key>
             <dict>
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>punctuation.definition.tag.end.tsx</string>
+                <string>punctuation.definition.tag.begin.tsx</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>entity.name.tag.tsx</string>
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=&lt;/)</string>
-            <key>contentName</key>
-            <string>meta.jsx.children.tsx</string>
+            <string>(?=(/&gt;)|(?:(&lt;/)([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))\s*(&gt;)))</string>
             <key>patterns</key>
             <array>
               <dict>
-                <key>include</key>
-                <string>#jsx-children</string>
+                <key>begin</key>
+                <string>\G(?![/]?&gt;)</string>
+                <key>end</key>
+                <string>(?=[/]?&gt;)</string>
+                <key>patterns</key>
+                <array>
+                  <dict>
+                    <key>include</key>
+                    <string>#comment</string>
+                  </dict>
+                  <dict>
+                    <key>include</key>
+                    <string>#jsx-tag-attributes</string>
+                  </dict>
+                  <dict>
+                    <key>include</key>
+                    <string>#jsx-tag-attributes-illegal</string>
+                  </dict>
+                </array>
+              </dict>
+              <dict>
+                <key>begin</key>
+                <string>(&gt;)</string>
+                <key>beginCaptures</key>
+                <dict>
+                  <key>1</key>
+                  <dict>
+                    <key>name</key>
+                    <string>punctuation.definition.tag.end.tsx</string>
+                  </dict>
+                </dict>
+                <key>end</key>
+                <string>(?=&lt;/)</string>
+                <key>contentName</key>
+                <string>meta.jsx.children.tsx</string>
+                <key>patterns</key>
+                <array>
+                  <dict>
+                    <key>include</key>
+                    <string>#jsx-children</string>
+                  </dict>
+                </array>
               </dict>
             </array>
           </dict>

tests/baselines/Issue180.baseline.txt

@@ -302,213 +302,3 @@ Grammar: TypeScript.tmLanguage
    source.ts comment.block.ts
            ^^
            source.ts comment.block.ts punctuation.definition.comment.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->if (typeof oSettings.aanFeatures.f != 'undefined')
->{
->    var n = oSettings.aanFeatures.f;
->    for ( i=0, iLen=n.length ; i<iLen ; i++ )
- ^^^^
- source.tsx meta.block.tsx
-     ^^^
-     source.tsx meta.block.tsx keyword.control.loop.tsx
-        ^
-        source.tsx meta.block.tsx
-         ^
-         source.tsx meta.block.tsx meta.brace.round.tsx
-          ^^
-          source.tsx meta.block.tsx
-            ^
-            source.tsx meta.block.tsx keyword.operator.assignment.tsx
-             ^
-             source.tsx meta.block.tsx constant.numeric.decimal.tsx
-              ^
-              source.tsx meta.block.tsx punctuation.separator.comma.tsx
-               ^^^^^
-               source.tsx meta.block.tsx
-                    ^
-                    source.tsx meta.block.tsx keyword.operator.assignment.tsx
-                     ^
-                     source.tsx meta.block.tsx
-                      ^
-                      source.tsx meta.block.tsx punctuation.accessor.tsx
-                       ^^^^^^^
-                       source.tsx meta.block.tsx
-                              ^
-                              source.tsx meta.block.tsx punctuation.terminator.statement.tsx
-                               ^^
-                               source.tsx meta.block.tsx
-                                 ^
-                                 source.tsx meta.block.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-                                  ^^^^
-                                  source.tsx meta.block.tsx meta.tag.tsx entity.name.tag.tsx
-                                      ^
-                                      source.tsx meta.block.tsx meta.tag.tsx
-                                       ^
-                                       source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                        ^
-                                        source.tsx meta.block.tsx meta.tag.tsx
-                                         ^^^
-                                         source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                            ^
-                                            source.tsx meta.block.tsx meta.tag.tsx
-                                             ^
-                                             source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                              ^^
-                                              source.tsx meta.block.tsx meta.tag.tsx
->    {
- ^^^^
- source.tsx meta.block.tsx meta.tag.tsx
-     ^
-     source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-      ^^
-      source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->        $('input', n[i]).val( '' );
- ^^^^^^^^
- source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-         ^
-         source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx variable.function.tsx
-          ^
-          source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-           ^
-           source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx
-            ^^^^^
-            source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.single.tsx
-                 ^
-                 source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx
-                  ^
-                  source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.separator.comma.tsx
-                   ^^
-                   source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-                     ^
-                     source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx
-                      ^
-                      source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.array.literal.tsx
-                       ^
-                       source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.brace.square.tsx
-                        ^
-                        source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-                         ^
-                         source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
-                          ^^^
-                          source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx variable.function.tsx
-                             ^
-                             source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-                              ^
-                              source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-                               ^
-                               source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx
-                                ^
-                                source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.single.tsx punctuation.definition.string.end.tsx
-                                 ^
-                                 source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-                                  ^
-                                  source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-                                   ^^^
-                                   source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->    }
- ^^^^
- source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-     ^
-     source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
-      ^^
-      source.tsx meta.block.tsx meta.tag.tsx
->}
- ^
- source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-  ^^
-  source.tsx meta.block.tsx meta.tag.tsx
->
- ^^
- source.tsx meta.block.tsx meta.tag.tsx
->/* some comment
- ^^
- source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx punctuation.definition.comment.tsx
-   ^^^^^^^^^^^^^^^
-   source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx
-> *
- ^^^^
- source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx
-> */
- ^
- source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx
-  ^^
-  source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx punctuation.definition.comment.tsx
-    ^^
-    source.tsx meta.block.tsx meta.tag.tsx
->for ( i=0, iLen=oSettings.aoPreSearchCols.length ; i<iLen ; i++)
- ^^^
- source.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
-    ^
-    source.tsx meta.block.tsx meta.tag.tsx
-     ^
-     source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-      ^
-      source.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx
-       ^
-       source.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
-        ^^^
-        source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-           ^
-           source.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx
-            ^^^^
-            source.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
-                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-                source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                 ^
-                                                 source.tsx meta.block.tsx meta.tag.tsx
-                                                  ^
-                                                  source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                   ^
-                                                   source.tsx meta.block.tsx meta.tag.tsx
-                                                    ^^^^^^
-                                                    source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                          ^
-                                                          source.tsx meta.block.tsx meta.tag.tsx
-                                                           ^
-                                                           source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                            ^
-                                                            source.tsx meta.block.tsx meta.tag.tsx
-                                                             ^^^^
-                                                             source.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                                 ^^
-                                                                 source.tsx meta.block.tsx meta.tag.tsx
->{
- ^
- source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-  ^^
-  source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->    oSetttings.something = "";
- ^^^^^^^^^^^^^^
- source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-               ^
-               source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
-                ^^^^^^^^^^
-                source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-                          ^
-                          source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx keyword.operator.assignment.tsx
-                           ^
-                           source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-                            ^
-                            source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.double.tsx punctuation.definition.string.begin.tsx
-                             ^
-                             source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx string.quoted.double.tsx punctuation.definition.string.end.tsx
-                              ^^^
-                              source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->}
- ^
- source.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
-  ^^
-  source.tsx meta.block.tsx meta.tag.tsx
->
- ^^
- source.tsx meta.block.tsx meta.tag.tsx
->/* redraw */
- ^^
- source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx punctuation.definition.comment.tsx
-   ^^^^^^^^
-   source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx
-           ^^
-           source.tsx meta.block.tsx meta.tag.tsx comment.block.tsx punctuation.definition.comment.tsx

tests/baselines/Issue182.baseline.txt

@@ -68,54 +68,3 @@ Grammar: TypeScript.tmLanguage
 >}
  ^
  source.ts meta.block.ts punctuation.definition.block.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->if (this.PListCells.length<value && (!this.ListList || !this.DelayedUpdate))
- ^^
- source.tsx keyword.control.conditional.tsx
-   ^
-   source.tsx
-    ^
-    source.tsx meta.brace.round.tsx
-     ^^^^
-     source.tsx variable.language.this.tsx
-         ^
-         source.tsx punctuation.accessor.tsx
-          ^^^^^^^^^^
-          source.tsx
-                    ^
-                    source.tsx punctuation.accessor.tsx
-                     ^^^^^^
-                     source.tsx
-                           ^
-                           source.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-                            ^^^^^
-                            source.tsx meta.tag.tsx entity.name.tag.tsx
-                                 ^
-                                 source.tsx meta.tag.tsx
-                                  ^^
-                                  source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                    ^
-                                    source.tsx meta.tag.tsx
-                                     ^^^^^^^^^^^^^^^
-                                     source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                    ^
-                                                    source.tsx meta.tag.tsx
-                                                     ^^
-                                                     source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                       ^
-                                                       source.tsx meta.tag.tsx
-                                                        ^^^^^^^^^^^^^^^^^^^^^
-                                                        source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                                             ^^
-                                                                             source.tsx meta.tag.tsx
->{
- ^
- source.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-  ^^
-  source.tsx meta.tag.tsx meta.brace.curly.tsx
->}
- ^
- source.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx

tests/baselines/Issue215.baseline.txt

@@ -142,110 +142,3 @@ Grammar: TypeScript.tmLanguage
 >}
  ^
  source.ts meta.block.ts punctuation.definition.block.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->function test() {
->    for (var i=0 ; i<l ; ++i) {
- ^^^^
- source.tsx meta.function.tsx meta.block.tsx
-     ^^^
-     source.tsx meta.function.tsx meta.block.tsx keyword.control.loop.tsx
-        ^
-        source.tsx meta.function.tsx meta.block.tsx
-         ^
-         source.tsx meta.function.tsx meta.block.tsx meta.brace.round.tsx
-          ^^^
-          source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx storage.type.tsx
-             ^
-             source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx
-              ^
-              source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
-               ^
-               source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx
-                ^
-                source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx constant.numeric.decimal.tsx
-                 ^
-                 source.tsx meta.function.tsx meta.block.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx
-                  ^
-                  source.tsx meta.function.tsx meta.block.tsx punctuation.terminator.statement.tsx
-                   ^^
-                   source.tsx meta.function.tsx meta.block.tsx
-                     ^
-                     source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-                      ^
-                      source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx entity.name.tag.tsx
-                       ^
-                       source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                        ^
-                        source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                         ^
-                         source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                          ^^^^
-                          source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                              ^
-                              source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                               ^
-                               source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-                                ^^
-                                source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->
- ^^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->    }
- ^^^^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
-     ^
-     source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
-      ^^
-      source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
->}
- ^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-  ^^
-  source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
->
- ^^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
->for (var i=0 ; i<l ; ++i) {
- ^^^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
-    ^
-    source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-     ^^^^
-     source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-         ^
-         source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx
-          ^
-          source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.tag.attribute-name.tsx entity.other.attribute-name.tsx
-           ^^
-           source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-             ^
-             source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-              ^
-              source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-               ^
-               source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                ^^^
-                source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                   ^
-                   source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                    ^
-                    source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                     ^
-                     source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                      ^^^^
-                      source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                          ^
-                          source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx
-                           ^
-                           source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-                            ^^
-                            source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->
- ^^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx
->}
- ^
- source.tsx meta.function.tsx meta.block.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx

tests/baselines/Issue223.baseline.txt

@@ -94,79 +94,3 @@ Grammar: TypeScript.tmLanguage
 >}
  ^
  source.ts meta.block.ts punctuation.definition.block.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->for (i = 0; i<len ; i++) {
- ^^^
- source.tsx keyword.control.loop.tsx
-    ^
-    source.tsx
-     ^
-     source.tsx meta.brace.round.tsx
-      ^^
-      source.tsx
-        ^
-        source.tsx keyword.operator.assignment.tsx
-         ^
-         source.tsx
-          ^
-          source.tsx constant.numeric.decimal.tsx
-           ^
-           source.tsx punctuation.terminator.statement.tsx
-            ^^
-            source.tsx
-              ^
-              source.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-               ^^^
-               source.tsx meta.tag.tsx entity.name.tag.tsx
-                  ^
-                  source.tsx meta.tag.tsx
-                   ^
-                   source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                    ^
-                    source.tsx meta.tag.tsx
-                     ^^^^
-                     source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                         ^
-                         source.tsx meta.tag.tsx
-                          ^
-                          source.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-                           ^^
-                           source.tsx meta.tag.tsx meta.brace.curly.tsx
->  if (foo) {
- ^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx
-   ^^
-   source.tsx meta.tag.tsx meta.brace.curly.tsx variable.function.tsx
-     ^
-     source.tsx meta.tag.tsx meta.brace.curly.tsx
-      ^
-      source.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-       ^^^
-       source.tsx meta.tag.tsx meta.brace.curly.tsx
-          ^
-          source.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-           ^
-           source.tsx meta.tag.tsx meta.brace.curly.tsx
-            ^
-            source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx punctuation.definition.block.tsx
-             ^^
-             source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx
->    bar = true 
- ^^^^^^^^^^^^^^^^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx
->    break 
- ^^^^^^^^^^^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx
->  }
- ^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx
-   ^
-   source.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx punctuation.definition.block.tsx
-    ^^
-    source.tsx meta.tag.tsx meta.brace.curly.tsx
->}
- ^
- source.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx

tests/baselines/Issue251.baseline.txt

@@ -206,153 +206,3 @@ Grammar: TypeScript.tmLanguage
 >}
  ^
  source.ts meta.block.ts punctuation.definition.block.ts
-
-
-Grammar: TypeScriptReact.tmLanguage
------------------------------------
->for(var j=0; (j<rows && l<num); j++) {
- ^^^
- source.tsx keyword.control.loop.tsx
-    ^
-    source.tsx meta.brace.round.tsx
-     ^^^
-     source.tsx meta.var.expr.tsx storage.type.tsx
-        ^
-        source.tsx meta.var.expr.tsx
-         ^
-         source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx variable.other.readwrite.tsx
-          ^
-          source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx keyword.operator.assignment.tsx
-           ^
-           source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx constant.numeric.decimal.tsx
-            ^
-            source.tsx punctuation.terminator.statement.tsx
-             ^
-             source.tsx
-              ^
-              source.tsx meta.brace.round.tsx
-               ^
-               source.tsx
-                ^
-                source.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-                 ^^^^
-                 source.tsx meta.tag.tsx entity.name.tag.tsx
-                     ^
-                     source.tsx meta.tag.tsx
-                      ^^
-                      source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                        ^
-                        source.tsx meta.tag.tsx
-                         ^^^^^^^
-                         source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                ^
-                                source.tsx meta.tag.tsx
-                                 ^^^^
-                                 source.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                     ^
-                                     source.tsx meta.tag.tsx
-                                      ^
-                                      source.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-                                       ^^
-                                       source.tsx meta.tag.tsx meta.brace.curly.tsx
->  for(var k = 0; (k<cols && l<num); k++){
- ^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx
-   ^^^
-   source.tsx meta.tag.tsx meta.brace.curly.tsx variable.function.tsx
-      ^
-      source.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-       ^^^^^^
-       source.tsx meta.tag.tsx meta.brace.curly.tsx
-             ^
-             source.tsx meta.tag.tsx meta.brace.curly.tsx keyword.operator.assignment.tsx
-              ^
-              source.tsx meta.tag.tsx meta.brace.curly.tsx
-               ^
-               source.tsx meta.tag.tsx meta.brace.curly.tsx constant.numeric.decimal.tsx
-                ^^
-                source.tsx meta.tag.tsx meta.brace.curly.tsx
-                  ^
-                  source.tsx meta.tag.tsx meta.brace.curly.tsx meta.brace.round.tsx
-                   ^
-                   source.tsx meta.tag.tsx meta.brace.curly.tsx
-                    ^
-                    source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
-                     ^^^^
-                     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx entity.name.tag.tsx
-                         ^
-                         source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-                          ^^
-                          source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                            ^
-                            source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-                             ^^^^^^^
-                             source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                    ^
-                                    source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-                                     ^^^^^
-                                     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                          ^^
-                                          source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
->    output.push( {h, w, x: k*w, y: h*j, file: file.file});
- ^^^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-     ^^^^^^^^^^^^
-     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                 ^
-                 source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-                  ^
-                  source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.start.tsx
-                   ^
-                   source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                    ^
-                    source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.separator.comma.tsx
-                     ^^
-                     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                       ^
-                       source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.separator.comma.tsx
-                        ^^^^^
-                        source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                             ^
-                             source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx
-                              ^
-                              source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                               ^
-                               source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.separator.comma.tsx
-                                ^^^^^
-                                source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                                     ^
-                                     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx keyword.operator.arithmetic.tsx
-                                      ^
-                                      source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                                       ^
-                                       source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.separator.comma.tsx
-                                        ^^^^^^^^^^^
-                                        source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                                                   ^
-                                                   source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.accessor.tsx
-                                                    ^^^^
-                                                    source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx
-                                                        ^
-                                                        source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx meta.brace.curly.tsx punctuation.definition.brace.curly.end.tsx
-                                                         ^^
-                                                         source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-                                                           ^^
-                                                           source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
->    l++;
- ^^^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-     ^^^^
-     source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-         ^^
-         source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
->  }
- ^^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
-   ^
-   source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx
-    ^^
-    source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx
->}
- ^
- source.tsx meta.tag.tsx meta.brace.curly.tsx meta.tag.tsx invalid.illegal.attribute.tsx