Fix JS expression interpolation in directives

deathaxe · skyronic · commit b83ec255cf5d · 2023-02-01T15:13:55.000-05:00
Addresses #216 (comment) This commit includes `JavaScript#expression-statement` context in attribute/directive values to highlight mappings correctly. The `pop: 1` is removed as the included context pops itself off stack.
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -599,17 +599,15 @@ contexts:
   vue-directive-value:
     - match: \"
       scope: meta.string.html string.quoted.double.html punctuation.definition.string.begin.html
-      pop: 1
-      embed: scope:source.js
+      embed: scope:source.js#expression-statement
       embed_scope: meta.string.html meta.interpolation.html source.js.embedded.html
       escape: \"
       escape_captures:
         0: meta.attribute-with-value.directive.html meta.string.html string.quoted.double.html
           punctuation.definition.string.end.html
     - match: \'
       scope: meta.string.html string.quoted.single.html punctuation.definition.string.begin.html
-      pop: 1
-      embed: scope:source.js
+      embed: scope:source.js#expression-statement
       embed_scope: meta.string.html meta.interpolation.html source.js.embedded.html
       escape: \'
       escape_captures:
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
@@ -362,8 +362,7 @@ contexts:
       scope:
         meta.string.html string.quoted.double.html
         punctuation.definition.string.begin.html
-      pop: 1
-      embed: scope:source.js
+      embed: scope:source.js#expression-statement
       embed_scope:
         meta.string.html meta.interpolation.html
         source.js.embedded.html
@@ -377,8 +376,7 @@ contexts:
       scope:
         meta.string.html string.quoted.single.html
         punctuation.definition.string.begin.html
-      pop: 1
-      embed: scope:source.js
+      embed: scope:source.js#expression-statement
       embed_scope:
         meta.string.html meta.interpolation.html
         source.js.embedded.html
diff --git a/tests/syntax_tests_mustage.vue b/tests/syntax_tests_mustage.vue
@@ -38,22 +38,31 @@
 //              ^^^^^^^^^^^ source.js.embedded.vue
 //                         ^^ punctuation.definition.template.end.html - source.js
 
-    <p v-attrib="let i = 0">
+    <p v-attrib="{'key': 'value'}">
 //  ^^^ meta.tag - meta.attribute-with-value
 //     ^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html - meta.string
 //              ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
-//               ^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html meta.string.html meta.interpolation.html source.js.embedded.html
-//                        ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
-//                         ^ meta.tag - meta.attribute-with-value
-//                          ^ - meta.tag
+//               ^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html meta.string.html meta.interpolation.html source.js.embedded.html meta.mapping
+//                               ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
+//                                ^ meta.tag - meta.attribute-with-value
+//                                 ^ - meta.tag
 
-    <p v-attrib='let i = 0'>
+    <p v-attrib="i = 0">
 //  ^^^ meta.tag - meta.attribute-with-value
 //     ^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html - meta.string
 //              ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
-//               ^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html meta.string.html meta.interpolation.html source.js.embedded.html
-//                        ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
-//                         ^ meta.tag - meta.attribute-with-value
-//                          ^ - meta.tag
+//               ^^^^^ meta.tag meta.attribute-with-value.directive.html meta.string.html meta.interpolation.html source.js.embedded.html
+//                    ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
+//                     ^ meta.tag - meta.attribute-with-value
+//                      ^ - meta.tag
+
+    <p v-attrib='i = 0'>
+//  ^^^ meta.tag - meta.attribute-with-value
+//     ^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html - meta.string
+//              ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
+//               ^^^^^ meta.tag meta.attribute-with-value.directive.html meta.string.html meta.interpolation.html source.js.embedded.html
+//                    ^ meta.tag meta.attribute-with-value.directive.html meta.string.html - meta.interpolation
+//                     ^ meta.tag - meta.attribute-with-value
+//                      ^ - meta.tag
 
 </html>
