[FJSX15] Fix template strings not being highlighted.

borela · Oct 3, 2016 · b540f24 · b540f24
1 parent 5ab3ddc
commit b540f24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/syntaxes/fjsx15/expression.sublime-syntax b/syntaxes/fjsx15/expression.sublime-syntax
@@ -65,13 +65,12 @@ contexts:
   content:
     - match: (?=\S)
       push:
-        - include: Packages/Naomi/syntaxes/js15/literal/string/regex.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/comment.sublime-syntax
+        - include: Packages/Naomi/syntaxes/fjsx15/literal.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/arrow-function.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/jsx.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/destructure.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/operator.sublime-syntax
-        - include: Packages/Naomi/syntaxes/fjsx15/literal.sublime-syntax
         - include: Packages/Naomi/syntaxes/js15/keywords.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/instanceof.sublime-syntax
         - include: Packages/Naomi/syntaxes/fjsx15/new.sublime-syntax

diff --git a/syntaxes/fjsx15/literal.sublime-syntax b/syntaxes/fjsx15/literal.sublime-syntax
@@ -22,4 +22,6 @@ contexts:
     - include: Packages/Naomi/syntaxes/fjsx15/literal/array.sublime-syntax
     - include: Packages/Naomi/syntaxes/js15/literal/string/double-quoted.sublime-syntax
     - include: Packages/Naomi/syntaxes/js15/literal/string/single-quoted.sublime-syntax
+    - include: Packages/Naomi/syntaxes/js15/literal/string/regex.sublime-syntax
+    - include: Packages/Naomi/syntaxes/js15/literal/string/template.sublime-syntax
     - include: Packages/Naomi/syntaxes/js15/literal/number.sublime-syntax