From 74fde6b00cbf4f2aa796d98a077d52656ade4856 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 18 Aug 2017 14:55:51 -0700 Subject: [PATCH] Fix template expression coloration not being reset in tsx files Fixes #32773 --- extensions/theme-defaults/themes/dark_vs.json | 9 +++------ .../theme-defaults/themes/hc_black_defaults.json | 10 +++------- extensions/theme-defaults/themes/light_vs.json | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json index 02e12514b26..4dd90c71801 100644 --- a/extensions/theme-defaults/themes/dark_vs.json +++ b/extensions/theme-defaults/themes/dark_vs.json @@ -243,10 +243,8 @@ { "name": "JavaScript string interpolation ${}", "scope": [ - "punctuation.definition.template-expression.begin.js", - "punctuation.definition.template-expression.begin.ts", - "punctuation.definition.template-expression.end.ts", - "punctuation.definition.template-expression.end.js", + "punctuation.definition.template-expression.begin", + "punctuation.definition.template-expression.end", "punctuation.section.embedded.coffee" ], "settings": { @@ -256,8 +254,7 @@ { "name": "Reset JavaScript string interpolation expression", "scope": [ - "meta.template.expression.js", - "meta.template.expression.ts" + "meta.template.expression" ], "settings": { "foreground": "#d4d4d4" diff --git a/extensions/theme-defaults/themes/hc_black_defaults.json b/extensions/theme-defaults/themes/hc_black_defaults.json index fe0b672d312..986fa7cf615 100644 --- a/extensions/theme-defaults/themes/hc_black_defaults.json +++ b/extensions/theme-defaults/themes/hc_black_defaults.json @@ -32,7 +32,6 @@ "foreground": "#000080" } }, - { "scope": "comment", "settings": { @@ -230,10 +229,8 @@ { "name": "JavaScript string interpolation ${}", "scope": [ - "punctuation.definition.template-expression.begin.js", - "punctuation.definition.template-expression.begin.ts", - "punctuation.definition.template-expression.end.ts", - "punctuation.definition.template-expression.end.js", + "punctuation.definition.template-expression.begin", + "punctuation.definition.template-expression.end", "punctuation.section.embedded.coffee" ], "settings": { @@ -243,8 +240,7 @@ { "name": "Reset JavaScript string interpolation expression", "scope": [ - "meta.template.expression.js", - "meta.template.expression.ts" + "meta.template.expression" ], "settings": { "foreground": "#ffffff" diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index a1d9f797f64..162c32f6218 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -239,10 +239,8 @@ { "name": "JavaScript string interpolation ${}", "scope": [ - "punctuation.definition.template-expression.begin.js", - "punctuation.definition.template-expression.begin.ts", - "punctuation.definition.template-expression.end.ts", - "punctuation.definition.template-expression.end.js", + "punctuation.definition.template-expression.begin", + "punctuation.definition.template-expression.end", "punctuation.section.embedded.coffee" ], "settings": { @@ -252,8 +250,7 @@ { "name": "Reset JavaScript string interpolation expression", "scope": [ - "meta.template.expression.js", - "meta.template.expression.ts" + "meta.template.expression" ], "settings": { "foreground": "#000000" -- GitLab