diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/html/test/colorize-results/12750_html.json
index a248a54eb8d..c70c7afdb8b 100644
--- a/extensions/html/test/colorize-results/12750_html.json
+++ b/extensions/html/test/colorize-results/12750_html.json
@@ -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"
}
},
{
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 7f2f1f0c5d0..bbe77ae2db9 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -3333,34 +3333,6 @@
}
}
},
- {
- "match": "(?x) (?]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\\()",
- "captures": {
- "1": {
- "name": "punctuation.accessor.js"
- },
- "2": {
- "name": "punctuation.accessor.optional.js"
- },
- "3": {
- "name": "support.constant.dom.js"
- },
- "4": {
- "name": "support.variable.property.dom.js"
- }
- }
- },
{
"name": "support.class.node.js",
"match": "(?x)(?]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\\()",
- "captures": {
- "1": {
- "name": "punctuation.accessor.js.jsx"
- },
- "2": {
- "name": "punctuation.accessor.optional.js.jsx"
- },
- "3": {
- "name": "support.constant.dom.js.jsx"
- },
- "4": {
- "name": "support.variable.property.dom.js.jsx"
- }
- }
- },
{
"name": "support.class.node.js.jsx",
"match": "(?x)(? {
+ 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'));
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 4b5480ed9a6..d5279579325 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -3367,34 +3367,6 @@
}
}
},
- {
- "match": "(?x) (?]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\\()",
- "captures": {
- "1": {
- "name": "punctuation.accessor.ts"
- },
- "2": {
- "name": "punctuation.accessor.optional.ts"
- },
- "3": {
- "name": "support.constant.dom.ts"
- },
- "4": {
- "name": "support.variable.property.dom.ts"
- }
- }
- },
{
"name": "support.class.node.ts",
"match": "(?x)(?]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\\()",
- "captures": {
- "1": {
- "name": "punctuation.accessor.tsx"
- },
- "2": {
- "name": "punctuation.accessor.optional.tsx"
- },
- "3": {
- "name": "support.constant.dom.tsx"
- },
- "4": {
- "name": "support.variable.property.dom.tsx"
- }
- }
- },
{
"name": "support.class.node.tsx",
"match": "(?x)(?