Merge branch 'develop'

Author: deathaxe

Vue Component.sublime-syntax

@@ -714,35 +714,41 @@ contexts:
     - meta_content_scope: meta.directive.vue
     - match: =
       scope: meta.directive.vue punctuation.separator.key-value.vue
-      set: vue-directive-value
+      set:
+        - immediately-pop
+        - vue-directive-value
     - include: else-pop
 
   vue-directive-value:
-    - meta_content_scope: meta.directive.vue
     - match: \"
-      scope: string.quoted.double.vue punctuation.definition.string.begin.vue
-      set: vue-directive-double-quoted-value
-    - match: \'
-      scope: string.quoted.single.vue punctuation.definition.string.begin.vue
-      set: vue-directive-single-quoted-value
-    - include: else-pop
-
-  vue-directive-double-quoted-value:
-    - meta_include_prototype: false
-    - meta_scope: meta.directive.value.vue meta.string.vue
-    - meta_content_scope: meta.embedded.expression.vue source.js.embedded.vue
-    - match: \"
-      scope: string.quoted.double.vue punctuation.definition.string.end.vue
+      scope:
+        meta.directive.value.vue meta.string.vue
+        string.quoted.double.vue punctuation.definition.string.begin.vue
+      embed: javascript-expressions
+      embed_scope:
+        meta.directive.value.vue meta.string.vue
+        meta.embedded.expression.vue source.js.embedded.vue
+      escape: \"
+      escape_captures:
+        0: meta.directive.value.vue meta.string.vue
+           string.quoted.double.vue punctuation.definition.string.end.vue
       pop: 1
-    - match: (?=\S)
-      push: scope:source.js#expression
-
-  vue-directive-single-quoted-value:
-    - meta_include_prototype: false
-    - meta_scope: meta.directive.value.vue meta.string.vue
-    - meta_content_scope: meta.embedded.expression.vue source.js.embedded.vue
     - match: \'
-      scope: string.quoted.single.vue punctuation.definition.string.end.vue
+      scope:
+        meta.directive.value.vue meta.string.vue
+        string.quoted.single.vue punctuation.definition.string.begin.vue
+      embed: javascript-expressions
+      embed_scope:
+        meta.directive.value.vue meta.string.vue
+        meta.embedded.expression.vue source.js.embedded.vue
+      escape: \'
+      escape_captures:
+        0: meta.directive.value.vue meta.string.vue
+           string.quoted.single.vue punctuation.definition.string.end.vue
       pop: 1
+    - include: else-pop
+
+  javascript-expressions:
+    # required until ST4176
     - match: (?=\S)
       push: scope:source.js#expression

tests/syntax_test_directive.vue

@@ -247,14 +247,6 @@
 //                                ^^^^^^^ meta.string.js string.quoted.double.js
 //                                        ^ keyword.operator.ternary.js
 //                                          ^^^^^ meta.string.js string.quoted.double.js
-        width: `'${width + "double" + 'single' + quoted}px'` // note the single quotes!
-//             ^^ meta.string string.quoted.other.js
-//               ^^^^^^^^^^ meta.string meta.interpolation.js - string
-//                         ^^^^^^^^ meta.interpolation.js string.quoted.double.js
-//                                 ^^^ meta.string meta.interpolation.js - string
-//                                    ^^^^^^^^ meta.interpolation.js string.quoted.single.js
-//                                            ^^^^^^^^^^ meta.string meta.interpolation.js - string
-//                                                      ^^^^ meta.string string.quoted.other.js
     }'>
 //^^^ meta.directive.value.vue meta.string.vue meta.embedded.expression.vue source.js.embedded.vue meta.mapping.js
 //   ^ meta.directive.value.vue meta.string.vue string.quoted.single.vue punctuation.definition.string.end.vue
@@ -385,3 +377,22 @@
 //                                          ^ meta.tag.template.begin.html meta.directive.vue
 //                                           ^ meta.tag.template.begin.html - meta.directive
 //                                            ^ - meta.tag
+
+
+// https://github.com/SublimeText/Vue/issues/48
+
+    <Component :name="obj?.name!" />
+//  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.other.html
+//  ^ punctuation.definition.tag.begin.html
+//   ^^^^^^^^^ entity.name.tag.other.html
+//             ^ meta.directive.vue keyword.other.directive.vue
+//              ^^^^ meta.directive.parameter.vue entity.other.attribute-name.vue
+//                  ^ meta.directive.vue punctuation.separator.key-value.vue
+//                   ^ meta.directive.value.vue meta.string.vue string.quoted.double.vue punctuation.definition.string.begin.vue
+//                    ^^^^^^^^^^ meta.directive.value.vue meta.string.vue meta.embedded.expression.vue source.js.embedded.vue
+//                    ^^^ variable.other.readwrite.js
+//                       ^^ punctuation.accessor.js
+//                         ^^^^ meta.property.object.js
+//                             ^ keyword.operator.logical.js
+//                              ^ meta.directive.value.vue meta.string.vue string.quoted.double.vue punctuation.definition.string.end.vue
+//                                ^^ punctuation.definition.tag.end.html