Merge pull request #535 from uniqueiniquity/jsxFragment

Add highlighting for JSX fragment

TypeScriptReact.YAML-tmLanguage

@@ -28,22 +28,21 @@ repository:
     patterns:
     - include: '#jsx-tag-without-attributes-in-expression'
     - include: '#jsx-tag-in-expression'
-    - include: '#jsx-tag-invalid'
 
   #jsx tags
   jsx-tag-without-attributes-in-expression:
     begin: |-
       (?x)
         (?<=[({\[,?=>:*]|&&|\|\||\?|\Wreturn|^return|\Wdefault|^)\s*
-        (?=(<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))\s*(>))
-    end: (?!\s*(<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))\s*(>))
+        (?=(<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))?\s*(>))
+    end: (?!\s*(<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))?\s*(>))
     patterns:
     - include: '#jsx-tag-without-attributes'
 
   jsx-tag-without-attributes:
     name: meta.tag.without-attributes.tsx
-    begin: (<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))\s*(>)
-    end: (</)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))\s*(>)
+    begin: (<)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))?\s*(>)
+    end: (</)\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\w.]*))(?<!\.|-))?\s*(>)
     beginCaptures:
       '1': {name: punctuation.definition.tag.begin.tsx}
       '2': {name: entity.name.tag.tsx}
@@ -128,16 +127,11 @@ repository:
       patterns:
       - include: '#jsx-children'
 
-  jsx-tag-invalid:
-    name: invalid.illegal.tag.incomplete.tsx
-    match: <\s*>
-
   #jsx children
   jsx-children:
     patterns:
     - include: '#jsx-tag-without-attributes'
     - include: '#jsx-child-tag'
-    - include: '#jsx-tag-invalid'
     - include: '#jsx-evaluated-code'
     - include: '#jsx-entities'
 

tests/baselines/issue534.baseline.txt

@@ -0,0 +1,154 @@
+original file
+-----------------------------------
+// @onlyOwnGrammar - As this has jsx
+<></>;
+<><span></span><><span></span></><div></div></>;
+
+<>
+    <span>hi</span>
+    <div>
+        <span>inside</span>
+    </div>
+</>;
+-----------------------------------
+
+Grammar: TypeScriptReact.tmLanguage
+-----------------------------------
+>// @onlyOwnGrammar - As this has jsx
+ ^^
+ source.tsx comment.line.double-slash.tsx punctuation.definition.comment.tsx
+   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   source.tsx comment.line.double-slash.tsx
+><></>;
+ ^
+ source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+  ^
+  source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+   ^^
+   source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+     ^
+     source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+      ^
+      source.tsx punctuation.terminator.statement.tsx
+><><span></span><><span></span></><div></div></>;
+ ^
+ source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+  ^
+  source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.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.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.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.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.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.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                  ^
+                  source.tsx meta.tag.without-attributes.tsx meta.jsx.children.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 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 meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                        ^^
+                        source.tsx meta.tag.without-attributes.tsx meta.jsx.children.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 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 meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.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.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.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.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.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.tag.without-attributes.tsx meta.jsx.children.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                                             ^^
+                                             source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+                                               ^
+                                               source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+                                                ^
+                                                source.tsx punctuation.terminator.statement.tsx
+>
+ ^
+ source.tsx
+><>
+ ^
+ source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+  ^
+  source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+>    <span>hi</span>
+ ^^^^
+ source.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.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.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.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
+>    <div>
+ ^^^^
+ source.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.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
+>        <span>inside</span>
+ ^^^^^^^^
+ source.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.without-attributes.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.without-attributes.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.without-attributes.tsx punctuation.definition.tag.end.tsx
+               ^^^^^^
+               source.tsx meta.tag.without-attributes.tsx meta.jsx.children.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.without-attributes.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.without-attributes.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.without-attributes.tsx punctuation.definition.tag.end.tsx
+>    </div>
+ ^^^^
+ source.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.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.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
+   ^
+   source.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.end.tsx
+    ^
+    source.tsx punctuation.terminator.statement.tsx

tests/cases/issue534.tsx

@@ -0,0 +1,10 @@
+// @onlyOwnGrammar - As this has jsx
+<></>;
+<><span></span><><span></span></><div></div></>;
+
+<>
+    <span>hi</span>
+    <div>
+        <span>inside</span>
+    </div>
+</>;