[FJSX15] Fix JSX greediness

borela · Jan 15, 2018 · 97e721f · 97e721f
1 parent b8d1a25
commit 97e721f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/syntaxes/fjsx15/jsx1-early.sublime-syntax b/syntaxes/fjsx15/jsx1-early.sublime-syntax
@@ -17,9 +17,16 @@ hidden: true
 
 scope: ...
 
+variables:
+  commonIdentifier: |
+    [$_[:alpha:]]
+    [$_.:[:alnum:]]*
+
 contexts:
   main:
-    - match: (?=\s*<)
+    - match: |
+        (?xi)
+        (?=\s*<(?>\s*>|{{commonIdentifier}}))
       with_prototype:
        - include: comment-and-embedded-js
       set: [ Packages/Naomi/syntaxes/naomi.jsx1.sublime-syntax ]

diff --git a/syntaxes/fjsx15/jsx1.sublime-syntax b/syntaxes/fjsx15/jsx1.sublime-syntax
@@ -26,7 +26,7 @@ contexts:
   main:
     - match: |
         (?xi)
-        (?=\s*<(?>>|{{commonIdentifier}}))
+        (?=\s*<(?>\s*>|{{commonIdentifier}}))
       with_prototype:
         - include: comment-and-embedded-js
       set: [ Packages/Naomi/syntaxes/naomi.jsx1.sublime-syntax ]