Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions

View File

@@ -23,6 +23,7 @@
"support.type",
"entity.name.type",
"entity.name.namespace",
"entity.other.attribute",
"entity.name.scope-resolution",
"entity.name.class",
"storage.type.numeric.go",
@@ -76,7 +77,8 @@
"source.cpp keyword.operator.new",
"keyword.operator.delete",
"keyword.other.using",
"keyword.other.operator"
"keyword.other.operator",
"entity.name.operator"
],
"settings": {
"foreground": "#C586C0"
@@ -171,72 +173,11 @@
"foreground": "#d7ba7d"
}
},
// Scopes that are potentially C++ only follow
{
"scope": "source.cpp entity.name",
"scope": "entity.name.label",
"settings": {
"foreground": "#C8C8C8"
}
},
{
"scope": "source.cpp keyword.control.directive",
"settings": {
"foreground": "#9B9B9B"
}
},
{
"scope": "source.cpp entity.name.function.operator",
"settings": {
"foreground": "#B4B4B4"
}
},
{
"scope": "source.cpp entity.name.function.preprocessor",
"settings": {
"foreground": "#C586C0"
}
},
{
"scope": "source.cpp entity.name.label",
"settings": {
"foreground": "#C8C8C8"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal",
"settings": {
"foreground": "#DADADA"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.number",
"settings": {
"foreground": "#B5CEA8"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#ce9178"
}
},
{
"scope": "source.cpp variable.other.enummember",
"settings": {
"foreground": "#B8D7A3"
}
},
{
"scope": "source.cpp variable.other.property",
"settings": {
"foreground": "#DADADA"
}
},
{
"scope": "source.cpp variable.parameter",
"settings": {
"foreground": "#7F7F7F"
}
}
]
}

View File

@@ -44,7 +44,11 @@
},
{
"scope": [
"constant.numeric"
"constant.numeric",
"entity.name.operator.custom-literal.number",
"variable.other.enummember",
"keyword.operator.plus.exponent",
"keyword.operator.minus.exponent"
],
"settings": {
"foreground": "#b5cea8"
@@ -166,7 +170,10 @@
}
},
{
"scope": "meta.preprocessor",
"scope": [
"meta.preprocessor",
"keyword.control.directive"
],
"settings": {
"foreground": "#569cd6"
}
@@ -208,13 +215,19 @@
}
},
{
"scope": "storage.modifier",
"scope": [
"storage.modifier",
"keyword.operator.noexcept"
],
"settings": {
"foreground": "#569cd6"
}
},
{
"scope": "string",
"scope": [
"string",
"entity.name.operator.custom-literal.string",
],
"settings": {
"foreground": "#ce9178"
}
@@ -294,8 +307,11 @@
"keyword.operator.expression",
"keyword.operator.cast",
"keyword.operator.sizeof",
"keyword.operator.typeid",
"keyword.operator.alignas",
"keyword.operator.instanceof",
"keyword.operator.logical.python"
"keyword.operator.logical.python",
"keyword.operator.wordlike"
],
"settings": {
"foreground": "#569cd6"
@@ -347,4 +363,4 @@
}
}
]
}
}

View File

@@ -23,6 +23,7 @@
"support.type",
"entity.name.type",
"entity.name.namespace",
"entity.other.attribute",
"entity.name.scope-resolution",
"entity.name.class",
"storage.type.numeric.go",
@@ -76,7 +77,8 @@
"source.cpp keyword.operator.new",
"source.cpp keyword.operator.delete",
"keyword.other.using",
"keyword.other.operator"
"keyword.other.operator",
"entity.name.operator"
],
"settings": {
"foreground": "#AF00DB"
@@ -171,54 +173,11 @@
"foreground": "#ff0000"
}
},
// Scopes that are potentially C++ only follow
{
"scope": "source.cpp entity.name",
"scope": "entity.name.label",
"settings": {
"foreground": "#000000"
}
},
{
"scope": "source.cpp keyword.control.directive",
"settings": {
"foreground": "#808080"
}
},
{
"scope": "source.cpp entity.name.function.operator",
"settings": {
"foreground": "#008080"
}
},
{
"scope": "source.cpp entity.name.function.preprocessor",
"settings": {
"foreground": "#AF00DB"
}
},
{
"scope": "source.cpp entity.name.label",
"settings": {
"foreground": "#000000"
}
},
{
"scope": "source.cpp entity.name.operator.custom-literal.string",
"settings": {
"foreground": "#0451a5"
}
},
{
"scope": "source.cpp variable.other.enummember",
"settings": {
"foreground": "#2F4F4F"
}
},
{
"scope": "source.cpp variable.parameter",
"settings": {
"foreground": "#808080"
}
}
]
}

View File

@@ -4,7 +4,10 @@
"include": "./light_defaults.json",
"tokenColors": [
{
"scope": ["meta.embedded", "source.groovy.embedded"],
"scope": [
"meta.embedded",
"source.groovy.embedded"
],
"settings": {
"foreground": "#000000ff"
}
@@ -41,7 +44,11 @@
},
{
"scope": [
"constant.numeric"
"constant.numeric",
"entity.name.operator.custom-literal.number",
"variable.other.enummember",
"keyword.operator.plus.exponent",
"keyword.operator.minus.exponent"
],
"settings": {
"foreground": "#09885a"
@@ -161,7 +168,10 @@
}
},
{
"scope": "meta.preprocessor",
"scope": [
"meta.preprocessor",
"keyword.control.directive"
],
"settings": {
"foreground": "#0000ff"
}
@@ -197,13 +207,19 @@
}
},
{
"scope": "storage.modifier",
"scope": [
"storage.modifier",
"keyword.operator.noexcept"
],
"settings": {
"foreground": "#0000ff"
}
},
{
"scope": "string",
"scope": [
"string",
"entity.name.operator.custom-literal.string",
],
"settings": {
"foreground": "#a31515"
}
@@ -315,8 +331,11 @@
"keyword.operator.expression",
"keyword.operator.cast",
"keyword.operator.sizeof",
"keyword.operator.typeid",
"keyword.operator.alignas",
"keyword.operator.instanceof",
"keyword.operator.logical.python"
"keyword.operator.logical.python",
"keyword.operator.wordlike"
],
"settings": {
"foreground": "#0000ff"
@@ -368,4 +387,4 @@
}
}
]
}
}