maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't treat dom properties as special for syntax highlighting

Browse source 
See https://github.com/Microsoft/TypeScript-TmLanguage/issues/691

Assuming that properties named `label` or `name` are dom properties is incorrect and causes a lot of false positives. This results in weirdly inconsistent colorization
This commit is contained in:
Matt Bierner 2019-01-02 17:33:50 -08:00
parent 5631529791
commit 5ed55a8606
10 changed files with 62 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
extensions/html/test/colorize-results/12750_html.json
View file

@ -111,13 +111,13 @@
},
{
"c": "window",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.variable.dom.js",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js variable.other.object.js",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{
@ -133,13 +133,13 @@
},
{
"c": "alert",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.function.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"
}
},
{
@ -298,13 +298,13 @@
},
{
"c": "window",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.variable.dom.js",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js variable.other.object.js",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "meta.embedded: #D4D4D4",
"light_vs": "meta.embedded: #000000",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{
@ -320,13 +320,13 @@
},
{
"c": "alert",
"t": "text.html.derivative meta.embedded.block.html source.js meta.function-call.js support.function.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"
}
},
{

51
extensions/javascript/syntaxes/JavaScript.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

51
extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

32
extensions/javascript/test/colorize-results/test_jsx.json
View file

@ -573,13 +573,13 @@
},
{
"c": "preventDefault",
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.function-call.js.jsx support.function.dom.js.jsx",
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.function-call.js.jsx entity.name.function.js.jsx",
"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"
}
},
{
@ -1475,13 +1475,13 @@
},
{
"c": "alt",
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.block.js.jsx support.variable.property.dom.js.jsx",
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.block.js.jsx variable.other.property.js.jsx",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{
@ -2344,13 +2344,13 @@
},
{
"c": "document",
"t": "source.js.jsx support.variable.dom.js.jsx",
"t": "source.js.jsx variable.other.object.js.jsx",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{
@ -2366,13 +2366,13 @@
},
{
"c": "body",
"t": "source.js.jsx support.variable.property.dom.js.jsx",
"t": "source.js.jsx variable.other.property.js.jsx",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{

8
extensions/pug/test/colorize-results/test_pug.json
View file

@ -980,13 +980,13 @@
},
{
"c": "name",
"t": "text.pug text.block.pug string.interpolated.pug support.variable.property.dom.js",
"t": "text.pug text.block.pug string.interpolated.pug variable.other.property.js",
"r": {
"dark_plus": "support.variable: #9CDCFE",
"light_plus": "support.variable: #001080",
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "string: #CE9178",
"light_vs": "string.interpolated.pug: #0000FF",
"hc_black": "support.variable: #9CDCFE"
"hc_black": "variable: #9CDCFE"
}
},
{

18
extensions/typescript-basics/build/update-grammars.js
View file

@ -6,6 +6,16 @@
var updateGrammar = require('../../../build/npm/update-grammar');
function removeDom(grammar) {
grammar.repository['support-objects'].patterns = grammar.repository['support-objects'].patterns.filter(pattern => {
if (pattern.match && pattern.match.match(/\b(HTMLElement|ATTRIBUTE_NODE|stopImmediatePropagation)\b/g)) {
return false;
}
return true;
});
return grammar;
}
function adaptToJavaScript(grammar, replacementScope) {
grammar.name = 'JavaScript (with React support)';
grammar.fileTypes = ['.js', '.jsx', '.es6', '.mjs' ];
@ -33,10 +43,10 @@ function adaptToJavaScript(grammar, replacementScope) {
}
var tsGrammarRepo = 'Microsoft/TypeScript-TmLanguage';
updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json');
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json');
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScript.tmLanguage.json', grammar => adaptToJavaScript(grammar, '.js'));
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScriptReact.tmLanguage.json', grammar => adaptToJavaScript(grammar, '.js.jsx'));
updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json', grammar => removeDom(grammar));
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json', grammar => removeDom(grammar));
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScript.tmLanguage.json', grammar => adaptToJavaScript(removeDom(grammar), '.js'));
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScriptReact.tmLanguage.json', grammar => adaptToJavaScript(removeDom(grammar), '.js.jsx'));

51
extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

51
extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

8
extensions/typescript-basics/test/colorize-results/test-function-inv_ts.json
View file

@ -23,13 +23,13 @@
},
{
"c": "push",
"t": "source.ts meta.function-call.ts support.function.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"
}
},
{

16
extensions/typescript-basics/test/colorize-results/test_ts.json
View file

@ -9153,13 +9153,13 @@
},
{
"c": "push",
"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts meta.function-call.ts support.function.ts",
"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.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"
}
},
{
@ -9406,13 +9406,13 @@
},
{
"c": "push",
"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.function-call.ts support.function.ts",
"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.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"
}
},
{