Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve colorization of embedded start end puctuators across languages

Browse Source
This commit is contained in:
Matt Bierner
2017-09-12 09:49:40 -07:00
parent 3d314e25eb
commit dc2f6ec2a5
11 changed files with 70 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/coffeescript/test/colorize-results/test-regex_coffee.json
+10 -10
View File
@@ -454,11 +454,11 @@
"c": "#{", "c": "#{",
"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -476,11 +476,11 @@
"c": "}", "c": "}",
"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/coffeescript/test/colorize-results/test_coffee.json
+20 -20
View File
@@ -311,11 +311,11 @@
"c": "#{", "c": "#{",
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -333,11 +333,11 @@
"c": "}", "c": "}",
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -575,11 +575,11 @@
"c": "#{", "c": "#{",
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -597,11 +597,11 @@
"c": "}", "c": "}",
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee", "t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
"r": { "r": {
"dark_plus": "punctuation.section.embedded.coffee: #569CD6", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "punctuation.section.embedded.coffee: #0000FF", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "punctuation.section.embedded.coffee: #569CD6", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "punctuation.section.embedded.coffee: #0000FF", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "punctuation.section.embedded.coffee: #569CD6" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/javascript/test/colorize-results/test_jsx.json
+20 -20
View File
@@ -1664,11 +1664,11 @@
"c": "{", "c": "{",
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.begin.js", "t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.begin.js",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -1686,11 +1686,11 @@
"c": "}", "c": "}",
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.end.js", "t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.end.js",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -1862,11 +1862,11 @@
"c": "{", "c": "{",
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.begin.js", "t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.begin.js",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -1906,11 +1906,11 @@
"c": "}", "c": "}",
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.end.js", "t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.end.js",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/php/test/colorize-results/issue-28354_php.json
+3 -3
View File
@@ -73,7 +73,7 @@
"light_plus": "punctuation.section.embedded.begin.php: #800000", "light_plus": "punctuation.section.embedded.begin.php: #800000",
"dark_vs": "punctuation.section.embedded.begin.php: #569CD6", "dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
"light_vs": "punctuation.section.embedded.begin.php: #800000", "light_vs": "punctuation.section.embedded.begin.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -458,7 +458,7 @@
"light_plus": "punctuation.section.embedded.end.php: #800000", "light_plus": "punctuation.section.embedded.end.php: #800000",
"dark_vs": "punctuation.section.embedded.end.php: #569CD6", "dark_vs": "punctuation.section.embedded.end.php: #569CD6",
"light_vs": "punctuation.section.embedded.end.php: #800000", "light_vs": "punctuation.section.embedded.end.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -469,7 +469,7 @@
"light_plus": "punctuation.section.embedded.end.php: #800000", "light_plus": "punctuation.section.embedded.end.php: #800000",
"dark_vs": "punctuation.section.embedded.end.php: #569CD6", "dark_vs": "punctuation.section.embedded.end.php: #569CD6",
"light_vs": "punctuation.section.embedded.end.php: #800000", "light_vs": "punctuation.section.embedded.end.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/php/test/colorize-results/test_php.json
+3 -3
View File
@@ -227,7 +227,7 @@
"light_plus": "punctuation.section.embedded.begin.php: #800000", "light_plus": "punctuation.section.embedded.begin.php: #800000",
"dark_vs": "punctuation.section.embedded.begin.php: #569CD6", "dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
"light_vs": "punctuation.section.embedded.begin.php: #800000", "light_vs": "punctuation.section.embedded.begin.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -3549,7 +3549,7 @@
"light_plus": "punctuation.section.embedded.end.php: #800000", "light_plus": "punctuation.section.embedded.end.php: #800000",
"dark_vs": "punctuation.section.embedded.end.php: #569CD6", "dark_vs": "punctuation.section.embedded.end.php: #569CD6",
"light_vs": "punctuation.section.embedded.end.php: #800000", "light_vs": "punctuation.section.embedded.end.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -3560,7 +3560,7 @@
"light_plus": "punctuation.section.embedded.end.php: #800000", "light_plus": "punctuation.section.embedded.end.php: #800000",
"dark_vs": "punctuation.section.embedded.end.php: #569CD6", "dark_vs": "punctuation.section.embedded.end.php: #569CD6",
"light_vs": "punctuation.section.embedded.end.php: #800000", "light_vs": "punctuation.section.embedded.end.php: #800000",
"hc_black": "default: #FFFFFF" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/ruby/test/colorize-results/test_rb.json
+10 -10
View File
@@ -2258,11 +2258,11 @@
"c": "#{", "c": "#{",
"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.begin.ruby", "t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.begin.ruby",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "string: #CE9178" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
@@ -2280,11 +2280,11 @@
"c": "}", "c": "}",
"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby source.ruby", "t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby source.ruby",
"r": { "r": {
"dark_plus": "meta.embedded: #D4D4D4", "dark_plus": "punctuation.section.embedded: #569CD6",
"light_plus": "meta.embedded: #000000", "light_plus": "punctuation.section.embedded: #0000FF",
"dark_vs": "meta.embedded: #D4D4D4", "dark_vs": "punctuation.section.embedded: #569CD6",
"light_vs": "meta.embedded: #000000", "light_vs": "punctuation.section.embedded: #0000FF",
"hc_black": "string: #CE9178" "hc_black": "punctuation.section.embedded: #569CD6"
} }
}, },
{ {
extensions/theme-defaults/themes/dark_vs.json
+1 -1
View File
@@ -252,7 +252,7 @@
"scope": [ "scope": [
"punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.begin",
"punctuation.definition.template-expression.end", "punctuation.definition.template-expression.end",
"punctuation.section.embedded.coffee" "punctuation.section.embedded"
], ],
"settings": { "settings": {
"foreground": "#569cd6" "foreground": "#569cd6"
extensions/theme-defaults/themes/hc_black_defaults.json
+1 -1
View File
@@ -231,7 +231,7 @@
"scope": [ "scope": [
"punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.begin",
"punctuation.definition.template-expression.end", "punctuation.definition.template-expression.end",
"punctuation.section.embedded.coffee" "punctuation.section.embedded"
], ],
"settings": { "settings": {
"foreground": "#569cd6" "foreground": "#569cd6"
extensions/theme-defaults/themes/light_vs.json
+1 -1
View File
@@ -248,7 +248,7 @@
"scope": [ "scope": [
"punctuation.definition.template-expression.begin", "punctuation.definition.template-expression.begin",
"punctuation.definition.template-expression.end", "punctuation.definition.template-expression.end",
"punctuation.section.embedded.coffee" "punctuation.section.embedded"
], ],
"settings": { "settings": {
"foreground": "#0000ff" "foreground": "#0000ff"
extensions/theme-monokai/themes/monokai-color-theme.json
+1 -1
View File
@@ -121,7 +121,7 @@
"name": "Template Definition", "name": "Template Definition",
"scope": [ "scope": [
"punctuation.definition.template-expression", "punctuation.definition.template-expression",
"punctuation.section.embedded.coffee" "punctuation.section.embedded"
], ],
"settings": { "settings": {
"foreground": "#F92672" "foreground": "#F92672"
extensions/theme-red/themes/Red-color-theme.json
-8
View File
@@ -169,14 +169,6 @@
"foreground": "#aa5507ff" "foreground": "#aa5507ff"
} }
}, },
{
"name": "String embedded-source",
"scope": "string.quoted source",
"settings": {
"fontStyle": "",
"foreground": "#9df39fff"
}
},
{ {
"name": "String constant", "name": "String constant",
"scope": "string constant", "scope": "string constant",