Skip to content

Commit

Permalink
Reset VS Dark + Light styling for meta embedded (#33866)
Browse files Browse the repository at this point in the history 
Fixes #33120

Adds rules to vs dark+light to reset style for meta embedded scopes. This is a proposed approach to support colorization of nested languages better
  • Loading branch information
@mjbvz
mjbvz authored Sep 6, 2017
1 parent 9455a2a commit 49db68d
Show file tree
Hide file tree
Showing 10 changed files with 1,346 additions and 1,332 deletions.
112 changes: 56 additions & 56 deletions extensions/html/test/colorize-results/12750_html.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"c": " ",
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand All @@ -47,10 +47,10 @@
"c": "=",
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand Down Expand Up @@ -102,10 +102,10 @@
"c": "\t",
"t": "text.html.basic meta.embedded.block.html source.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand All @@ -115,19 +115,19 @@
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.variable: #9CDCFE"
}
},
{
"c": ".",
"t": "text.html.basic meta.embedded.block.html source.js meta.function-call.js punctuation.accessor.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand All @@ -137,19 +137,19 @@
"r": {
"dark_plus": "support.function: #DCDCAA",
"light_plus": "support.function: #795E26",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.function: #DCDCAA"
}
},
{
"c": "(",
"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand Down Expand Up @@ -190,21 +190,21 @@
"c": ")",
"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": ";",
"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand Down Expand Up @@ -289,10 +289,10 @@
"c": "\t",
"t": "text.html.basic meta.embedded.block.html source.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand All @@ -302,19 +302,19 @@
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.variable: #9CDCFE"
}
},
{
"c": ".",
"t": "text.html.basic meta.embedded.block.html source.js meta.function-call.js punctuation.accessor.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand All @@ -324,19 +324,19 @@
"r": {
"dark_plus": "support.function: #DCDCAA",
"light_plus": "support.function: #795E26",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.function: #DCDCAA"
}
},
{
"c": "(",
"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand Down Expand Up @@ -377,21 +377,21 @@
"c": ")",
"t": "text.html.basic meta.embedded.block.html source.js meta.brace.round.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": ";",
"t": "text.html.basic meta.embedded.block.html source.js punctuation.terminator.statement.js",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "meta.embedded: #D4D4D4",
"light_plus": "meta.embedded: #000000",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "default: #FFFFFF"
}
},
Expand Down
Loading

0 comments on commit 49db68d

Please sign in to comment.