Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Common] Adjust meta.embedded vs. meta.interpolation #4054

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+129 −171
Open

[Common] Adjust meta.embedded vs. meta.interpolation #4054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions ASP/HTML (ASP).sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.js.embedded.asp
embed_scope:
meta.string.html meta.interpolation.html
source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -54,9 +52,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.js.embedded.asp
embed_scope:
meta.string.html meta.interpolation.html
source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand All @@ -69,9 +65,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.css.embedded.asp#rule-list-body
embed_scope:
meta.string.html meta.interpolation.html
source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -81,9 +75,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.css.embedded.asp#rule-list-body
embed_scope:
meta.string.html meta.interpolation.html
source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand Down Expand Up @@ -271,7 +263,6 @@ contexts:

asp-tag-clear-scope:
- clear_scopes: 1
- meta_scope: meta.interpolation.html
- include: immediately-pop

asp-tag-content:
Expand Down
40 changes: 20 additions & 20 deletions ASP/syntax_test_asp.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,22 +170,22 @@
<script type="application/ld+json">
{
<% key %>: <%.Site.Color%>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.embedded.html
| ^^^^^^^^^ meta.mapping.json meta.interpolation.asp
| ^^ meta.mapping.json - meta.interpolation
| ^^^^^^^^^^^^^^^ meta.mapping.value.json meta.interpolation.asp
| ^ meta.mapping.json - meta.interpolation
' ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.embedded.html
' ^^^^^^^^^ meta.mapping.json meta.embedded.asp
' ^^ meta.mapping.json - meta.embedded
' ^^^^^^^^^^^^^^^ meta.mapping.value.json meta.embedded.asp
' ^ meta.mapping.json - meta.embedded

"<% key %>": "<%.Site.Color%>",
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.embedded.html
| ^ meta.mapping.key.json string.quoted.double.json punctuation.definition.string.begin.json
| ^^^^^^^^^ meta.mapping.key.json meta.interpolation.asp - string
| ^ meta.mapping.key.json string.quoted.double.json punctuation.definition.string.end.json
| ^^ meta.mapping.json - meta.interpolation
| ^ meta.mapping.value.json meta.string.json string.quoted.double.json punctuation.definition.string.begin.json
| ^^^^^^^^^^^^^^^ meta.mapping.value.json meta.interpolation.asp - string
| ^ meta.mapping.value.json meta.string.json string.quoted.double.json punctuation.definition.string.end.json
| ^ meta.mapping.json - meta.interpolation
' ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.json.embedded.html
' ^ meta.mapping.key.json string.quoted.double.json punctuation.definition.string.begin.json
' ^^^^^^^^^ meta.mapping.key.json meta.embedded.asp - string
' ^ meta.mapping.key.json string.quoted.double.json punctuation.definition.string.end.json
' ^^ meta.mapping.json - meta.embedded
' ^ meta.mapping.value.json meta.string.json string.quoted.double.json punctuation.definition.string.begin.json
' ^^^^^^^^^^^^^^^ meta.mapping.value.json meta.embedded.asp - string
' ^ meta.mapping.value.json meta.string.json string.quoted.double.json punctuation.definition.string.end.json
' ^ meta.mapping.json - meta.embedded
}
</script>

Expand Down Expand Up @@ -1244,10 +1244,10 @@ test = "hello%>
'^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.block.any.html
' ^^^^^^^^^ meta.tag.block.any.html
' ^^^^^ meta.attribute-with-value.class.html entity.other.attribute-name.class.html
' ^ meta.attribute-with-value.class.html meta.string.html string.quoted.double.html - meta.interpolation
' ^^ meta.attribute-with-value.class.html meta.string.html meta.interpolation.html - string
' ^^^^^^^^^ meta.attribute-with-value.class.html meta.string.html meta.interpolation.html - string
' ^ meta.attribute-with-value.class.html meta.string.html string.quoted.double.html - meta.interpolation
' ^ meta.attribute-with-value.class.html meta.string.html string.quoted.double.html - meta.embedded
' ^^ meta.attribute-with-value.class.html meta.string.html meta.embedded.asp - string
' ^^^^^^^^^ meta.attribute-with-value.class.html meta.string.html meta.embedded.asp - string
' ^ meta.attribute-with-value.class.html meta.string.html string.quoted.double.html - meta.embedded
' ^ - string
' ^^^^^^^^^^^^^^^^ meta.class-name.html
' ^^^^^^^^^^ meta.class-name.html
Expand Down Expand Up @@ -1376,15 +1376,15 @@ test = "hello%>

<![CDATA[Text with <%= vbscript %> interpolation.]]>
' ^^^^^^^^^^ meta.tag.sgml.cdata.html meta.string.html string.unquoted.cdata.html
' ^^^^^^^^^^^^^^^ meta.tag.sgml.cdata.html meta.string.html meta.interpolation.html - string
' ^^^^^^^^^^^^^^^ meta.tag.sgml.cdata.html meta.string.html meta.embedded.asp - string
' ^^^^^^^^^^^^^^^ meta.tag.sgml.cdata.html meta.string.html string.unquoted.cdata.html
' ^^^ punctuation.section.embedded.begin.asp
' ^^ punctuation.section.embedded.end.asp

<my-<%=tag%> <%=attr%>=<%=value%>/>
' ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.tag.other.html
' ^ meta.tag.other.html punctuation.definition.tag.begin.html
' ^^^ entity.name.tag.other.html - meta.interpolation
' ^^^ entity.name.tag.other.html - meta.embedded
' ^^^^^^^^ entity.name.tag.other.html meta.embedded.asp
' ^^^ punctuation.section.embedded.begin.asp
' ^^^ variable.other.asp
Expand Down
8 changes: 4 additions & 4 deletions Go/Embeddings/HTML (for Go Embedded Backtick Strings).sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.js.go-embedded-backtick-string
embed_scope: meta.string.html meta.embedded.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -83,7 +83,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.js.go-embedded-backtick-string
embed_scope: meta.string.html meta.embedded.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand All @@ -96,7 +96,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.css.go-embedded-backtick-string#rule-list-body
embed_scope: meta.string.html meta.embedded.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -106,7 +106,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.css.go-embedded-backtick-string#rule-list-body
embed_scope: meta.string.html meta.embedded.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand Down
8 changes: 4 additions & 4 deletions Go/HTML (Go).sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.js.go
embed_scope: meta.string.html meta.embedded.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -87,7 +87,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.js.go
embed_scope: meta.string.html meta.embedded.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand All @@ -100,7 +100,7 @@ contexts:
meta.string.html string.quoted.double.html
punctuation.definition.string.begin.html
embed: scope:source.css.go#rule-list-body
embed_scope: meta.string.html meta.embedded.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \"
escape_captures:
0: meta.string.html string.quoted.double.html
Expand All @@ -110,7 +110,7 @@ contexts:
meta.string.html string.quoted.single.html
punctuation.definition.string.begin.html
embed: scope:source.css.go#rule-list-body
embed_scope: meta.string.html meta.embedded.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html
Expand Down
2 changes: 1 addition & 1 deletion Go/tests/syntax_test_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
| ^^^^ meta.tag - meta.attribute-with-value
| ^^^^^^ meta.tag meta.attribute-with-value.style.html - meta.string
| ^^^^^^^^ meta.tag meta.attribute-with-value.style.html meta.string.html - meta.interpolation
| ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.style.html meta.string.html meta.embedded.html source.css.embedded.html meta.property-value.css meta.interpolation.go
| ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.style.html meta.string.html source.css.embedded.html meta.property-value.css meta.interpolation.go
| ^ meta.tag meta.attribute-with-value.style.html meta.string.html - meta.interpolation
| ^^ meta.tag - meta.attribute-with-value
| ^^ punctuation.section.interpolation.begin.go - source.go.template
Expand Down
2 changes: 1 addition & 1 deletion Go/tests/syntax_test_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
| ^^^^ meta.disable-markdown meta.tag - meta.attribute-with-value
| ^^^^^^ meta.disable-markdown meta.tag meta.attribute-with-value.style.html - meta.string
| ^^^^^^^^ meta.disable-markdown meta.tag meta.attribute-with-value.style.html meta.string.html - meta.interpolation
| ^^^^^^^^^^^^^^^ meta.disable-markdown meta.tag meta.attribute-with-value.style.html meta.string.html meta.embedded.html source.css.embedded.html meta.property-value.css meta.interpolation.go
| ^^^^^^^^^^^^^^^ meta.disable-markdown meta.tag meta.attribute-with-value.style.html meta.string.html source.css.embedded.html meta.property-value.css meta.interpolation.go
| ^ meta.disable-markdown meta.tag meta.attribute-with-value.style.html meta.string.html - meta.interpolation
| ^^ meta.disable-markdown meta.tag - meta.attribute-with-value
| ^^ punctuation.section.interpolation.begin.go - source.go.template
Expand Down
8 changes: 4 additions & 4 deletions HTML/HTML.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,14 +683,14 @@ contexts:
- match: \"
scope: meta.string.html string.quoted.double.html punctuation.definition.string.begin.html
embed: scope:source.js
embed_scope: meta.string.html meta.interpolation.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \"
escape_captures:
0: 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
embed: scope:source.js
embed_scope: meta.string.html meta.interpolation.html source.js.embedded.html
embed_scope: meta.string.html source.js.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html punctuation.definition.string.end.html
Expand Down Expand Up @@ -859,14 +859,14 @@ contexts:
- match: \"
scope: meta.string.html string.quoted.double.html punctuation.definition.string.begin.html
embed: scope:source.css#rule-list-body
embed_scope: meta.string.html meta.interpolation.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \"
escape_captures:
0: 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
embed: scope:source.css#rule-list-body
embed_scope: meta.string.html meta.interpolation.html source.css.embedded.html
embed_scope: meta.string.html source.css.embedded.html
escape: \'
escape_captures:
0: meta.string.html string.quoted.single.html punctuation.definition.string.end.html
Expand Down
24 changes: 12 additions & 12 deletions HTML/syntax_test_html.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,9 @@
## ^ - meta.attribute-with-value.style
## ^^^^^^^^^^^^^^^^^^^ - meta.attribute-with-value.style meta.attribute-with-value.style
## ^^^^^^ meta.attribute-with-value.style.html - meta.string - string - source.css
## ^ meta.attribute-with-value.style.html meta.string.html - meta.interpolation - source.css
## ^^^^^^^^^^^ meta.attribute-with-value.style.html meta.string.html meta.interpolation.html source.css.embedded.html - string
## ^ meta.attribute-with-value.style.html meta.string.html - meta.interpolation - source.css
## ^ meta.attribute-with-value.style.html meta.string.html - source.css
## ^^^^^^^^^^^ meta.attribute-with-value.style.html meta.string.html source.css.embedded.html - string
## ^ meta.attribute-with-value.style.html meta.string.html - source.css
## ^^^^^ entity.other.attribute-name.style.html
## ^ punctuation.separator.key-value.html
## ^ string.quoted.double.html punctuation.definition.string.begin.html
Expand All @@ -813,9 +813,9 @@
## ^ - meta.attribute-with-value.style
## ^^^^^^^^^^^^^^^^^^^^ - meta.attribute-with-value.style meta.attribute-with-value.style
## ^^^^^^ meta.attribute-with-value.style.html - meta.string - string - source.css
## ^ meta.attribute-with-value.style.html meta.string.html - meta.interpolation - source.css
## ^^^^^^^^^^^^ meta.attribute-with-value.style.html meta.string.html meta.interpolation.html source.css.embedded.html - string
## ^ meta.attribute-with-value.style.html meta.string.html - meta.interpolation - source.css
## ^ meta.attribute-with-value.style.html meta.string.html - source.css
## ^^^^^^^^^^^^ meta.attribute-with-value.style.html meta.string.html source.css.embedded.html - string
## ^ meta.attribute-with-value.style.html meta.string.html - source.css
## ^^^^^ entity.other.attribute-name.style.html
## ^ punctuation.separator.key-value.html
## ^ string.quoted.single.html punctuation.definition.string.begin.html
Expand Down Expand Up @@ -863,9 +863,9 @@
## ^ - meta.attribute-with-value.event
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.attribute-with-value meta.attribute-with-value - source.js source.js
## ^^^^^^^^ meta.attribute-with-value.event - meta.string
## ^ meta.attribute-with-value.event.html meta.string.html - meta.interpolation
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.event.html meta.string.html meta.interpolation.html
## ^ meta.attribute-with-value.event.html meta.string.html - meta.interpolation
## ^ meta.attribute-with-value.event.html meta.string.html
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.event.html meta.string.html
## ^ meta.attribute-with-value.event.html meta.string.html
## ^^^^^^^^ entity.other.attribute-name
## ^ string.quoted.double.html punctuation.definition.string.begin.html - source.js
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.html - string
Expand All @@ -878,9 +878,9 @@
## ^ - meta.attribute-with-value.event
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.attribute-with-value meta.attribute-with-value - source.js source.js
## ^^^^^^^^ meta.attribute-with-value.event - meta.string
## ^ meta.attribute-with-value.event.html meta.string.html - meta.interpolation
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.event.html meta.string.html meta.interpolation.html
## ^ meta.attribute-with-value.event.html meta.string.html - meta.interpolation
## ^ meta.attribute-with-value.event.html meta.string.html
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.attribute-with-value.event.html meta.string.html
## ^ meta.attribute-with-value.event.html meta.string.html
## ^^^^^^^^ entity.other.attribute-name
## ^ string.quoted.single.html punctuation.definition.string.begin.html - source.js
## ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.js.embedded.html - string
Expand Down
Loading