development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change HTML grammar to be more precise (embedded modes). fixes #14295

Browse source
This commit is contained in:
Martin Aeschlimann 2016-10-24 23:19:07 +02:00
parent fbabb13f4e
commit 7bdc667cd4
4 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/html/syntaxes/html.json
View file

@ -152,7 +152,7 @@
}
},
"end": "(</)((?i:style))(>)(?:\\s*\\n)?",
"name": "source.css.embedded.html",
"contentName": "source.css.embedded.html",
"patterns": [
{
"include": "#tag-stuff"
@ -192,7 +192,7 @@
"name": "punctuation.definition.tag.html"
}
},
"name": "source.js.embedded.html",
"contentName": "source.js.embedded.html",
"patterns": [
{
"include": "#tag-stuff"
@ -364,7 +364,7 @@
"python": {
"begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
"end": "\\?>(?:\\s*$\\n)?",
"name": "source.python.embedded.html",
"contentName": "source.python.embedded.html",
"patterns": [
{
"include": "source.python"
@ -389,7 +389,7 @@
"begin": "{{|{",
"disabled": 1,
"end": "}}|}",
"name": "source.smarty.embedded.html",
"contentName": "source.smarty.embedded.html",
"patterns": [
{
"include": "source.smarty"

28
extensions/html/test/colorize-results/12750_html.json
View file

@ -1,18 +1,18 @@
[
{
"c": "<",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "script",
"t": "embedded.entity.html.js.name.script.source.tag",
"t": "entity.html.name.script.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -232,29 +232,29 @@
},
{
"c": ">",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "<",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "script",
"t": "embedded.entity.html.js.name.script.source.tag",
"t": "entity.html.name.script.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -408,11 +408,11 @@
},
{
"c": ">",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}

60
extensions/html/test/colorize-results/test_html.json
View file

@ -441,7 +441,7 @@
},
{
"c": "\t",
"t": "css.embedded.html.source",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -452,7 +452,7 @@
},
{
"c": "<",
"t": "css.definition.embedded.html.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -463,7 +463,7 @@
},
{
"c": "style",
"t": "css.embedded.entity.html.name.source.style.tag",
"t": "entity.html.name.style.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -771,7 +771,7 @@
},
{
"c": "</",
"t": "css.definition.embedded.html.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -782,7 +782,7 @@
},
{
"c": "style",
"t": "css.embedded.entity.html.name.source.style.tag",
"t": "entity.html.name.style.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -793,7 +793,7 @@
},
{
"c": ">",
"t": "css.definition.embedded.html.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -1079,7 +1079,7 @@
},
{
"c": "\t",
"t": "embedded.html.js.source",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -1090,18 +1090,18 @@
},
{
"c": "<",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "script",
"t": "embedded.entity.html.js.name.script.source.tag",
"t": "entity.html.name.script.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -1200,18 +1200,18 @@
},
{
"c": ">",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "\t",
"t": "embedded.html.js.source",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -1222,18 +1222,18 @@
},
{
"c": "<",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "script",
"t": "embedded.entity.html.js.name.script.source.tag",
"t": "entity.html.name.script.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -1332,18 +1332,18 @@
},
{
"c": ">",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "\t",
"t": "embedded.html.js.source",
"t": "",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -1354,18 +1354,18 @@
},
{
"c": "<",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}
},
{
"c": "script",
"t": "embedded.entity.html.js.name.script.source.tag",
"t": "entity.html.name.script.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -2179,11 +2179,11 @@
},
{
"c": ">",
"t": "definition.embedded.html.js.punctuation.source.tag",
"t": "definition.html.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.punctuation.tag.js rgb(128, 128, 128)",
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
"light_vs": ".vs .token rgb(0, 0, 0)",
"hc_black": ".hc-black .token rgb(255, 255, 255)"
}

12
extensions/markdown/test/colorize-results/test_md.json
View file

@ -1024,7 +1024,7 @@
},
{
"c": " ",
"t": "css.embedded.html.markdown.meta.paragraph.source",
"t": "markdown.meta.paragraph",
"r": {
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
"light_plus": ".vs .token rgb(0, 0, 0)",
@ -1035,7 +1035,7 @@
},
{
"c": "<",
"t": "css.definition.embedded.html.markdown.meta.paragraph.punctuation.source.tag",
"t": "definition.html.markdown.meta.paragraph.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@ -1046,7 +1046,7 @@
},
{
"c": "style",
"t": "css.embedded.entity.html.markdown.meta.name.paragraph.source.style.tag",
"t": "entity.html.markdown.meta.name.paragraph.style.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -1222,7 +1222,7 @@
},
{
"c": "</",
"t": "css.definition.embedded.html.markdown.meta.paragraph.punctuation.source.tag",
"t": "definition.html.markdown.meta.paragraph.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@ -1233,7 +1233,7 @@
},
{
"c": "style",
"t": "css.embedded.entity.html.markdown.meta.name.paragraph.source.style.tag",
"t": "entity.html.markdown.meta.name.paragraph.style.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.entity.name.tag rgb(86, 156, 214)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.entity.name.tag rgb(128, 0, 0)",
@ -1244,7 +1244,7 @@
},
{
"c": ">",
"t": "css.definition.embedded.html.markdown.meta.paragraph.punctuation.source.tag",
"t": "definition.html.markdown.meta.paragraph.punctuation.tag",
"r": {
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",