Commitec6e5e7

deathaxe

authored and

skyronic

committed

Fix attribute name interpolation

1. extend `meta.interpolation` to include leading and trailing punctuation to comply with ST's scope naming guidelines.2. fix closing `]` scope.3. adjust/add tests

1 parentfc9fc77 commitec6e5e7Copy full SHA for ec6e5e7

File tree

3 files changed

+14

-13

lines changed

3 files changed

+14

-13

lines changed

`‎Vue Component.sublime-syntax‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -623,10 +623,10 @@ contexts:`
`623`	`623`	`vue-dynamic-attribute-name:`
`624`	`624`	-clear_scopes:1# clear `entity.other.attribute-name`
`625`	`625`	`-match:\[`
`626`		`-scope:punctuation.section.interpolation.begin.vue`
	`626`	`+scope:meta.interpolation.vuepunctuation.section.interpolation.begin.vue`
`627`	`627`	`embed:scope:source.js#expression-statement`
`628`	`628`	`embed_scope:meta.interpolation.vue source.js.embedded.vue`
`629`	`629`	`escape:\]`
`630`	`630`	`escape_captures:`
`631`		`-0:punctuation.definition.string.end.html`
`632`		`- -include:else-pop`
	`631`	`+0:meta.interpolation.vuepunctuation.definition.interpolation.end.vue`
	`632`	`+ -include:immediately-pop`

`‎Vue Component.sublime-syntax.yaml-macros‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,10 +396,10 @@ contexts:`
`396`	`396`	`vue-dynamic-attribute-name:`
`397`	`397`	- clear_scopes: 1 # clear `entity.other.attribute-name`
`398`	`398`	`- match: \[`
`399`		`- scope: punctuation.section.interpolation.begin.vue`
	`399`	`+ scope:meta.interpolation.vuepunctuation.section.interpolation.begin.vue`
`400`	`400`	`embed: scope:source.js#expression-statement`
`401`	`401`	`embed_scope: meta.interpolation.vue source.js.embedded.vue`
`402`	`402`	`escape: \]`
`403`	`403`	`escape_captures:`
`404`		`- 0: punctuation.definition.string.end.html`
`405`		`- - include:else-pop`
	`404`	`+ 0:meta.interpolation.vuepunctuation.definition.interpolation.end.vue`
	`405`	`+ - include:immediately-pop`

`‎tests/syntax_tests_mustage.vue‎`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,19 +128,20 @@`
`128`	`128`	<template #[`content-${variable}`]>
`129`	`129`	`// ^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html`
`130`	`130`	`// ^ entity.other.attribute-name.html`
`131`		`-// ^ punctuation.section.interpolation.begin.vue`
	`131`	`+// ^meta.interpolation.vuepunctuation.section.interpolation.begin.vue - source.js.embedded`
`132`	`132`	`// ^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.vue source.js.embedded.vue - entity.other.attribute-name.html`
`133`		`-// ^ punctuation.definition.string.end.html`
	`133`	`+// ^meta.interpolation.vuepunctuation.definition.interpolation.end.vue - source.js.embedded`
`134`	`134`	`// ^ meta.tag - meta.attribute-with-value`
`135`	`135`	`// ^ - meta.tag`
`136`	`136`
`137`		- <template v-slot:[`content-${variable}`]>
	`137`	+ <template v-slot:[`content-${variable}`]>
`138`	`138`	`// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.directive.html`
`139`	`139`	`// ^^^^^^^ entity.other.attribute-name.html`
`140`		`-// ^ punctuation.section.interpolation.begin.vue`
	`140`	`+// ^meta.interpolation.vuepunctuation.section.interpolation.begin.vue - source.js.embedded`
`141`	`141`	`// ^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.vue source.js.embedded.vue - entity.other.attribute-name.html`
`142`		`-// ^ punctuation.definition.string.end.html`
`143`		`-// ^ meta.tag - meta.attribute-with-value`
`144`		`-// ^ - meta.tag`
	`142`	`+// ^ meta.interpolation.vue punctuation.definition.interpolation.end.vue - source.js.embedded`
	`143`	`+// ^ meta.tag - meta.interpolation`
	`144`	`+// ^ meta.tag - meta.attribute-with-value`
	`145`	`+// ^ - meta.tag`
`145`	`146`
`146`	`147`	`</html>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitec6e5e7

File tree

3 files changed

3 files changed

`‎Vue Component.sublime-syntax‎`

`‎Vue Component.sublime-syntax.yaml-macros‎`

`‎tests/syntax_tests_mustage.vue‎`

0 commit comments