提交 a877e052 编写于 作者: M Matt Bierner

Remove special grammar rules for console in js/ts

Fixes #101802

These can be better handled by semantic highlighting
上级 7b4c5f61
......@@ -34,13 +34,13 @@
},
{
"c": "console",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.class.console.js",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js variable.other.object.js",
"r": {
"dark_plus": "support.class: #4EC9B0",
"light_plus": "support.class: #267F99",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.class: #4EC9B0"
"hc_black": "variable: #9CDCFE"
}
},
{
......@@ -56,13 +56,13 @@
},
{
"c": "log",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.function.console.js",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js entity.name.function.js",
"r": {
"dark_plus": "support.function: #DCDCAA",
"light_plus": "support.function: #795E26",
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.function: #DCDCAA"
"hc_black": "entity.name.function: #DCDCAA"
}
},
{
......
......@@ -3532,23 +3532,6 @@
}
}
},
{
"match": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(console)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\n assert|clear|count|debug|dir|error|group|groupCollapsed|groupEnd|info|log\n |profile|profileEnd|table|time|timeEnd|timeStamp|trace|warn))?\\b(?!\\$)",
"captures": {
"1": {
"name": "support.class.console.js"
},
"2": {
"name": "punctuation.accessor.js"
},
"3": {
"name": "punctuation.accessor.optional.js"
},
"4": {
"name": "support.function.console.js"
}
}
},
{
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(JSON)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(parse|stringify))?\\b(?!\\$)",
"captures": {
......@@ -5754,4 +5737,4 @@
"match": "\\S+"
}
}
}
\ No newline at end of file
}
......@@ -3532,23 +3532,6 @@
}
}
},
{
"match": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(console)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\n assert|clear|count|debug|dir|error|group|groupCollapsed|groupEnd|info|log\n |profile|profileEnd|table|time|timeEnd|timeStamp|trace|warn))?\\b(?!\\$)",
"captures": {
"1": {
"name": "support.class.console.js.jsx"
},
"2": {
"name": "punctuation.accessor.js.jsx"
},
"3": {
"name": "punctuation.accessor.optional.js.jsx"
},
"4": {
"name": "support.function.console.js.jsx"
}
}
},
{
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(JSON)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(parse|stringify))?\\b(?!\\$)",
"captures": {
......
......@@ -25,7 +25,10 @@ function removeNodeTypes(grammar) {
}
}
if (pattern.captures) {
if (Object.values(pattern.captures).some(capture => capture.name && capture.name.startsWith('support.variable.object.process'))) {
if (Object.values(pattern.captures).some(capture =>
capture.name && (capture.name.startsWith('support.variable.object.process')
|| capture.name.startsWith('support.class.console'))
)) {
return false;
}
}
......
......@@ -3581,23 +3581,6 @@
}
}
},
{
"match": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(console)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\n assert|clear|count|debug|dir|error|group|groupCollapsed|groupEnd|info|log\n |profile|profileEnd|table|time|timeEnd|timeStamp|trace|warn))?\\b(?!\\$)",
"captures": {
"1": {
"name": "support.class.console.ts"
},
"2": {
"name": "punctuation.accessor.ts"
},
"3": {
"name": "punctuation.accessor.optional.ts"
},
"4": {
"name": "support.function.console.ts"
}
}
},
{
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(JSON)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(parse|stringify))?\\b(?!\\$)",
"captures": {
......
......@@ -3532,23 +3532,6 @@
}
}
},
{
"match": "(?x)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(console)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\n assert|clear|count|debug|dir|error|group|groupCollapsed|groupEnd|info|log\n |profile|profileEnd|table|time|timeEnd|timeStamp|trace|warn))?\\b(?!\\$)",
"captures": {
"1": {
"name": "support.class.console.tsx"
},
"2": {
"name": "punctuation.accessor.tsx"
},
"3": {
"name": "punctuation.accessor.optional.tsx"
},
"4": {
"name": "support.function.console.tsx"
}
}
},
{
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(JSON)(?:\\s*(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(parse|stringify))?\\b(?!\\$)",
"captures": {
......
......@@ -155,13 +155,13 @@
},
{
"c": "console",
"t": "source.ts meta.function-call.ts support.class.console.ts",
"t": "source.ts meta.function-call.ts variable.other.object.ts",
"r": {
"dark_plus": "support.class: #4EC9B0",
"light_plus": "support.class: #267F99",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "support.class: #4EC9B0"
"hc_black": "variable: #9CDCFE"
}
},
{
......@@ -177,13 +177,13 @@
},
{
"c": "log",
"t": "source.ts meta.function-call.ts support.function.console.ts",
"t": "source.ts meta.function-call.ts entity.name.function.ts",
"r": {
"dark_plus": "support.function: #DCDCAA",
"light_plus": "support.function: #795E26",
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "support.function: #DCDCAA"
"hc_black": "entity.name.function: #DCDCAA"
}
},
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册