mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
fixes #5579: [java] Colorization could be improved for import text
This commit is contained in:
parent
de4c7a2e84
commit
6132cb3b35
|
@ -1,4 +1,7 @@
|
||||||
|
package foo;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.junit.runners.*;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Multi line comment
|
* Multi line comment
|
||||||
|
|
|
@ -1,4 +1,48 @@
|
||||||
[
|
[
|
||||||
|
{
|
||||||
|
"c": "package",
|
||||||
|
"t": "java.keyword.meta.other.package",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword rgb(86, 156, 214)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword rgb(0, 0, 255)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword rgb(86, 156, 214)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": " ",
|
||||||
|
"t": "java.meta.package",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs .token rgb(0, 0, 0)",
|
||||||
|
"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": "foo",
|
||||||
|
"t": "java.meta.modifier.package.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.package.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.package.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.package.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.package.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.package.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": ";",
|
||||||
|
"t": "java.meta.package.punctuation.terminator",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs .token rgb(0, 0, 0)",
|
||||||
|
"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": "import",
|
"c": "import",
|
||||||
"t": "import.java.keyword.meta.other",
|
"t": "import.java.keyword.meta.other",
|
||||||
|
@ -25,55 +69,165 @@
|
||||||
"c": "org",
|
"c": "org",
|
||||||
"t": "import.java.meta.modifier.storage",
|
"t": "import.java.meta.modifier.storage",
|
||||||
"r": {
|
"r": {
|
||||||
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier rgb(86, 156, 214)"
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"c": ".",
|
"c": ".",
|
||||||
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
||||||
"r": {
|
"r": {
|
||||||
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier rgb(86, 156, 214)"
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"c": "junit",
|
"c": "junit",
|
||||||
"t": "import.java.meta.modifier.storage",
|
"t": "import.java.meta.modifier.storage",
|
||||||
"r": {
|
"r": {
|
||||||
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier rgb(86, 156, 214)"
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"c": ".",
|
"c": ".",
|
||||||
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
||||||
"r": {
|
"r": {
|
||||||
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier rgb(86, 156, 214)"
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"c": "Test",
|
"c": "Test",
|
||||||
"t": "import.java.meta.modifier.storage",
|
"t": "import.java.meta.modifier.storage",
|
||||||
"r": {
|
"r": {
|
||||||
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier rgb(86, 156, 214)",
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier rgb(0, 0, 255)",
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier rgb(86, 156, 214)"
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": ";",
|
||||||
|
"t": "import.java.meta.punctuation.terminator",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs .token rgb(0, 0, 0)",
|
||||||
|
"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": "import",
|
||||||
|
"t": "import.java.keyword.meta.other",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword rgb(86, 156, 214)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword rgb(0, 0, 255)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword rgb(86, 156, 214)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword rgb(0, 0, 255)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword rgb(86, 156, 214)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": " ",
|
||||||
|
"t": "import.java.meta",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs .token rgb(0, 0, 0)",
|
||||||
|
"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": "org",
|
||||||
|
"t": "import.java.meta.modifier.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": ".",
|
||||||
|
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": "junit",
|
||||||
|
"t": "import.java.meta.modifier.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": ".",
|
||||||
|
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": "runners",
|
||||||
|
"t": "import.java.meta.modifier.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": ".",
|
||||||
|
"t": "import.java.meta.modifier.punctuation.separator.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": "*",
|
||||||
|
"t": "import.java.meta.modifier.storage",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.storage.modifier.import.java rgb(212, 212, 212)",
|
||||||
|
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.storage.modifier.import.java rgb(0, 0, 0)",
|
||||||
|
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.storage.modifier.import.java rgb(212, 212, 212)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -278,6 +278,13 @@
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "#b5cea8"
|
"foreground": "#b5cea8"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "coloring of the Java import and package identifiers",
|
||||||
|
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
|
||||||
|
"settings": {
|
||||||
|
"foreground": "#d4d4d4"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -253,6 +253,13 @@
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "#b5cea8"
|
"foreground": "#b5cea8"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "coloring of the Java import and package identifiers",
|
||||||
|
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
|
||||||
|
"settings": {
|
||||||
|
"foreground": "#d4d4d4"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -267,6 +267,13 @@
|
||||||
"settings": {
|
"settings": {
|
||||||
"foreground": "#09885a"
|
"foreground": "#09885a"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "coloring of the Java import and package identifiers",
|
||||||
|
"scope": ["storage.modifier.import.java", "storage.modifier.package.java"],
|
||||||
|
"settings": {
|
||||||
|
"foreground": "#000000"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
Reference in a new issue