From 380dcaf8b0524662a3438e00cb28a2efba31b05f Mon Sep 17 00:00:00 2001 From: FichteFoll Date: Fri, 27 Oct 2023 16:30:54 +0200 Subject: [PATCH 1/2] Fix scope name of interpolation end (attribute syntax) --- Vue Component.sublime-syntax | 2 +- Vue Component.sublime-syntax.yaml-macros | 2 +- tests/syntax_tests_mustage.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax index abd5245..753b4bb 100644 --- a/Vue Component.sublime-syntax +++ b/Vue Component.sublime-syntax @@ -628,5 +628,5 @@ contexts: embed_scope: meta.interpolation.vue source.js.embedded.vue escape: \] escape_captures: - 0: meta.interpolation.vue punctuation.definition.interpolation.end.vue + 0: meta.interpolation.vue punctuation.section.interpolation.end.vue - include: immediately-pop diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros index 6daadfb..0e60aba 100644 --- a/Vue Component.sublime-syntax.yaml-macros +++ b/Vue Component.sublime-syntax.yaml-macros @@ -401,5 +401,5 @@ contexts: embed_scope: meta.interpolation.vue source.js.embedded.vue escape: \] escape_captures: - 0: meta.interpolation.vue punctuation.definition.interpolation.end.vue + 0: meta.interpolation.vue punctuation.section.interpolation.end.vue - include: immediately-pop diff --git a/tests/syntax_tests_mustage.vue b/tests/syntax_tests_mustage.vue index 693ae30..539edaf 100644 --- a/tests/syntax_tests_mustage.vue +++ b/tests/syntax_tests_mustage.vue @@ -130,7 +130,7 @@ // ^ entity.other.attribute-name.html // ^ meta.interpolation.vue punctuation.section.interpolation.begin.vue - source.js.embedded // ^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.vue source.js.embedded.vue - entity.other.attribute-name.html -// ^ meta.interpolation.vue punctuation.definition.interpolation.end.vue - source.js.embedded +// ^ meta.interpolation.vue punctuation.section.interpolation.end.vue - source.js.embedded // ^ meta.tag - meta.attribute-with-value // ^ - meta.tag @@ -139,7 +139,7 @@ // ^^^^^^^ entity.other.attribute-name.html // ^ meta.interpolation.vue punctuation.section.interpolation.begin.vue - source.js.embedded // ^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.vue source.js.embedded.vue - entity.other.attribute-name.html -// ^ meta.interpolation.vue punctuation.definition.interpolation.end.vue - source.js.embedded +// ^ meta.interpolation.vue punctuation.section.interpolation.end.vue - source.js.embedded // ^ meta.tag - meta.interpolation // ^ meta.tag - meta.attribute-with-value // ^ - meta.tag From eb18e84ae025f1da30da835040a0804e94a487f2 Mon Sep 17 00:00:00 2001 From: FichteFoll Date: Fri, 27 Oct 2023 16:34:50 +0200 Subject: [PATCH 2/2] Use `punctuation.section` also for mustage interpolation This is the standard scope name for this token. --- Vue Component.sublime-syntax | 4 ++-- Vue Component.sublime-syntax.yaml-macros | 4 ++-- tests/syntax_tests_mustage.vue | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax index 753b4bb..f2de041 100644 --- a/Vue Component.sublime-syntax +++ b/Vue Component.sublime-syntax @@ -562,12 +562,12 @@ contexts: mustache-templates: - match: '{{' - scope: meta.interpolation.vue punctuation.definition.interpolation.begin.html + scope: meta.interpolation.vue punctuation.section.interpolation.begin.html embed: scope:source.js embed_scope: meta.interpolation.vue source.js.embedded.vue escape: '}}' escape_captures: - 0: meta.interpolation.vue punctuation.definition.interpolation.end.html + 0: meta.interpolation.vue punctuation.section.interpolation.end.html ###[ VUE DIRECTIVES ]######################################################### diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros index 0e60aba..d060bca 100644 --- a/Vue Component.sublime-syntax.yaml-macros +++ b/Vue Component.sublime-syntax.yaml-macros @@ -323,12 +323,12 @@ contexts: mustache-templates: - match: '{{' - scope: meta.interpolation.vue punctuation.definition.interpolation.begin.html + scope: meta.interpolation.vue punctuation.section.interpolation.begin.html embed: scope:source.js embed_scope: meta.interpolation.vue source.js.embedded.vue escape: '}}' escape_captures: - 0: meta.interpolation.vue punctuation.definition.interpolation.end.html + 0: meta.interpolation.vue punctuation.section.interpolation.end.html ###[ VUE DIRECTIVES ]######################################################### diff --git a/tests/syntax_tests_mustage.vue b/tests/syntax_tests_mustage.vue index 539edaf..839e2ed 100644 --- a/tests/syntax_tests_mustage.vue +++ b/tests/syntax_tests_mustage.vue @@ -2,24 +2,24 @@

{{ foo.text }}

// ^^^^^^^^^^^^^^ meta.interpolation.vue -// ^^ punctuation.definition.interpolation.begin.html +// ^^ punctuation.section.interpolation.begin.html // ^^^^^^^^^^ source.js.embedded.vue -// ^^ punctuation.definition.interpolation.end.html +// ^^ punctuation.section.interpolation.end.html

// ^^^^^^^^^^^^^^ meta.interpolation.vue -// ^^ punctuation.definition.interpolation.begin.html +// ^^ punctuation.section.interpolation.begin.html // ^^^^^^^^^^ source.js.embedded.vue -// ^^ punctuation.definition.interpolation.end.html +// ^^ punctuation.section.interpolation.end.html

// ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation // ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue // ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation // ^ string.quoted.double.html punctuation.definition.string.begin.html -// ^^ punctuation.definition.interpolation.begin.html - source.js +// ^^ punctuation.section.interpolation.begin.html - source.js // ^^^^^^^^^^^ source.js.embedded.vue -// ^^ punctuation.definition.interpolation.end.html - source.js +// ^^ punctuation.section.interpolation.end.html - source.js // ^ string.quoted.double.html punctuation.definition.string.end.html

@@ -27,16 +27,16 @@ // ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue // ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation // ^ string.quoted.single.html punctuation.definition.string.begin.html -// ^^ punctuation.definition.interpolation.begin.html - source.js +// ^^ punctuation.section.interpolation.begin.html - source.js // ^^^^^^^^^^^ source.js.embedded.vue -// ^^ punctuation.definition.interpolation.end.html - source.js +// ^^ punctuation.section.interpolation.end.html - source.js // ^ string.quoted.single.html punctuation.definition.string.end.html

// ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue -// ^^ punctuation.definition.interpolation.begin.html - source.js +// ^^ punctuation.section.interpolation.begin.html - source.js // ^^^^^^^^^^^ source.js.embedded.vue -// ^^ punctuation.definition.interpolation.end.html - source.js +// ^^ punctuation.section.interpolation.end.html - source.js

// ^^^ meta.tag - meta.attribute-with-value