Merge branch 'fix/jsx-support'

Author: deathaxe

Vue Component.sublime-syntax

@@ -74,11 +74,6 @@ contexts:
         - script-coffeescript
         - tag-lang-attribute-meta
         - tag-generic-attribute-value
-    - match: (?i)(?=jsx{{unquoted_attribute_break}}|'jsx'|"jsx")
-      set:
-        - script-jsx
-        - tag-lang-attribute-meta
-        - tag-generic-attribute-value
     - match: (?i)(?=livescript{{unquoted_attribute_break}}|'livescript'|"livescript")
       set:
         - script-livescript
@@ -146,15 +141,10 @@ contexts:
         3: source.coffee.embedded.html
         4: comment.block.html punctuation.definition.comment.end.html
 
-  script-jsx:
-    - meta_include_prototype: false
-    - meta_scope: meta.tag.script.begin.html
-    - match: '>'
-      scope: punctuation.definition.tag.end.html
-      set: script-jsx-content
-    - include: script-common
-
-  script-jsx-content:
+  script-javascript-content:
+    # Note: Augment default JavaScript by JSX
+    # as Vue supports writing components via JSX tags by default
+    # and JSX highlights/scopes plain JavaScript without issues.
     - meta_include_prototype: false
     - match: '{{script_content_begin}}'
       captures:

tests/syntax_test_script.vue

@@ -5,38 +5,62 @@
 
     <script> var i = 0; </script>
 //  ^^^^^^^^ meta.tag - source
-//          ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
+//          ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
 //                      ^^^^^^^^^ meta.tag - source
 
     <script> var i = 0; --> </script>
 //  ^^^^^^^^ meta.tag - source
-//          ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
+//          ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
 //                      ^^^^ - meta.tag - source
 //                      ^^^ comment.block.html punctuation.definition.comment.end.html
 //                          ^^^^^^^^^ meta.tag - source
 
     <script> <!-- var i = 0; </script>
 //  ^^^^^^^^ meta.tag - source
 //          ^^^^^ - meta.tag - source
-//               ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
+//               ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
 //                           ^^^^^^^^^ meta.tag - source
 //           ^^^^ punctuation.definition.comment.begin.html
 
     <script> <!-- var i = 0; --> </script>
 //  ^^^^^^^^ meta.tag - source
 //          ^^^^^ - meta.tag - source
 //           ^^^^ punctuation.definition.comment.begin.html
-//               ^^^^^^^^^^^^ source.js.embedded.html - meta.tag
+//               ^^^^^^^^^^^^ source.jsx.embedded.html - meta.tag
 //                           ^^^^ - meta.tag - source
 //                           ^^^ comment.block.html punctuation.definition.comment.end.html
 //                               ^^^^^^^^^ meta.tag - source
 
 
     <script>
 
-// <- source.js.embedded.html
+// <- source.jsx.embedded.html
     var i = 0;
-// ^^^^^^^^^^^^ source.js.embedded.html - source source
+// ^^^^^^^^^^^^ source.jsx.embedded.html - source source
+    export default {
+      render () {
+        return <div>{ this.foo }</div>
+//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.jsx.embedded.html
+//      ^^^^^^ keyword.control.flow.return.js
+//             ^^^^^^^^^^^^^^^^^^^^^^^ meta.jsx.js
+//             ^^^^^ meta.tag
+//             ^ punctuation.definition.tag.begin.js
+//              ^^^ entity.name.tag
+//                 ^ punctuation.definition.tag.end.js
+//                  ^^^^^^^^^^^^ meta.interpolation.js
+//                  ^ punctuation.definition.interpolation.begin.js
+//                   ^^^^^^^^^^ source.js.embedded.jsx
+//                             ^ punctuation.definition.interpolation.end.js
+//                              ^^^^^^ meta.tag
+//                              ^^ punctuation.definition.tag.begin.js
+//                                ^^^ entity.name.tag
+//                                   ^ punctuation.definition.tag.end.js
+      }
+//^^^^^^ source.jsx.embedded.html
+//    ^ punctuation.section
+    }
+//^^^^ source.jsx.embedded.html
+//  ^ punctuation.section
     </script>
 //  ^^^^^^^^^ meta.tag - source
 
@@ -46,7 +70,7 @@
 //^^^^^^ - meta.tag - source
 //  ^^^^ comment.block.html punctuation.definition.comment.begin.html
     var i = 0;
-// ^^^^^^^^^^^^ source.js.embedded.html - source source - meta.tag
+// ^^^^^^^^^^^^ source.jsx.embedded.html - source source - meta.tag
     -->
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
 //     ^ - comment - source
@@ -66,10 +90,10 @@
 //           ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
     var foo = 100;
-// <- source.js.embedded.html - source source
+// <- source.jsx.embedded.html - source source
 
     (a --> b);
-//     ^^^ source.js.embedded.html keyword.operator - comment
+//     ^^^ source.jsx.embedded.html keyword.operator - comment
 
     --> </script>
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
@@ -92,10 +116,10 @@
 //                                  ^^^^ comment.block.html punctuation.definition.comment.begin.html
 
     var foo = 100;
-// <- source.js.embedded.html - source source
+// <- source.jsx.embedded.html - source source
 
     (a --> b);
-//     ^^^ source.js.embedded.html keyword.operator - comment
+//     ^^^ source.jsx.embedded.html keyword.operator - comment
 
     --> </script>
 //  ^^^ comment.block.html punctuation.definition.comment.end.html - source
@@ -113,8 +137,8 @@
     application/jAvAsCrIpT>
 //  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value - meta.attribute-with-value meta.attribute-with-value
     var foo = 100;
-// <- source.js.embedded.html - source source
-// ^^^^^^^^^^^^^^^^ source.js.embedded.html - source source
+// <- source.jsx.embedded.html - source source
+// ^^^^^^^^^^^^^^^^ source.jsx.embedded.html - source source
     </script>
 //  ^^^^^^^^^ meta.tag - source