From 8bd5dafa1ec981c8a0a23e2719e924f13bf2da4b Mon Sep 17 00:00:00 2001 From: Preston Lamb Date: Tue, 13 Jun 2017 16:42:25 -0600 Subject: [PATCH 1/3] Some JS and TS theme fixes for Visual Studio Code --- cobalt2.tmTheme | 89 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 7 deletions(-) diff --git a/cobalt2.tmTheme b/cobalt2.tmTheme index e5f8759..69dab3d 100644 --- a/cobalt2.tmTheme +++ b/cobalt2.tmTheme @@ -926,8 +926,8 @@ Template Literals - ticks scope - , template.begin, - , template.end, + , punctuation.definition.string.template.begin.js, + , punctuation.definition.string.template.end.js, settings @@ -940,7 +940,7 @@ name Template Literals - words scope - template + string.template.js settings foreground @@ -953,9 +953,9 @@ Template Literals - expressions scope - , string.template.expression.punctuation.begin, - , string.template.expression.punctuation.end, - , string.template.expression.brace, + , string.template punctuation, + , string.template punctuation, + , string.template punctuation, settings @@ -980,7 +980,7 @@ name Template Literals - language scope - template.variable.language + string.template variable settings fontStyle @@ -990,6 +990,81 @@ + + + name + TypeScript Function + scope + storage.type.function.ts + settings + + foreground + #FFA5F3 + background + #1D3C52 + + + + + name + Quotes + scope + + , punctuation.definition.string.begin.ts, + , punctuation.definition.string.end.ts, + + settings + + foreground + #2EFF00 + + + + + name + Template Literals - ticks + scope + + , punctuation.definition.string.template.begin.ts, + , punctuation.definition.string.template.end.ts, + + settings + + foreground + #2EFF00 + + + + + name + Template Literals - words + scope + string.template.ts + settings + + foreground + #9EFF80 + + + + + + name + Object Keys + scope + + , string.unquoted.label.ts, + , meta.object-literal.key.ts, + + settings + + foreground + #2AFFDF + + + + + From 686571b0ca0d8fcc9563923258286c31a4a2bea2 Mon Sep 17 00:00:00 2001 From: Preston Lamb Date: Tue, 13 Jun 2017 17:50:48 -0600 Subject: [PATCH 2/3] Make the punctuation more specific so it won't affect other languages --- cobalt2.tmTheme | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cobalt2.tmTheme b/cobalt2.tmTheme index 69dab3d..827e0d6 100644 --- a/cobalt2.tmTheme +++ b/cobalt2.tmTheme @@ -953,9 +953,7 @@ Template Literals - expressions scope - , string.template punctuation, - , string.template punctuation, - , string.template punctuation, + , string.template.js punctuation, settings @@ -1047,6 +1045,19 @@ + + name + Template Literals - expressions + scope + + , string.template.ts punctuation, + + settings + + foreground + #FFFFFF + + name From e7175283f0505bae9ae8483d6c656e583a3b6e2d Mon Sep 17 00:00:00 2001 From: Preston Lamb Date: Tue, 13 Jun 2017 23:11:34 -0600 Subject: [PATCH 3/3] Add some styling for jsx files, although the HTML in the render function is still all one color essentially --- cobalt2.tmTheme | 119 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 1 deletion(-) diff --git a/cobalt2.tmTheme b/cobalt2.tmTheme index 827e0d6..9a38479 100644 --- a/cobalt2.tmTheme +++ b/cobalt2.tmTheme @@ -988,6 +988,116 @@ + + + name + JavaScript Function + scope + storage.type.function.jsx + settings + + foreground + #FFA5F3 + background + #1D3C52 + + + + + name + Quotes + scope + + , punctuation.definition.string.begin.jsx, + , punctuation.definition.string.end.jsx, + + settings + + foreground + #2EFF00 + + + + + name + Object Keys + scope + + , string.unquoted.label.jsx, + , meta.object-literal.key.jsx, + + settings + + foreground + #2AFFDF + + + + + name + Object Keys - strings + scope + meta.object-literal.key.string.quoted + settings + + foreground + #80FFBB + + + + + name + Object Keys - functions + scope + meta.object-literal.key.entity + settings + + foreground + #FFC600 + + + + + name + Template Literals - ticks + scope + + , punctuation.definition.string.template.begin.jsx, + , punctuation.definition.string.template.end.jsx, + + settings + + foreground + #2EFF00 + + + + + name + Template Literals - words + scope + string.template.jsx + settings + + foreground + #9EFF80 + + + + + name + Template Literals - expressions + scope + + , string.template.jsx punctuation, + + settings + + foreground + #FFFFFF + + + name @@ -1087,6 +1197,8 @@ , entity.name.class.js, , entity.name.type.class.js, + , entity.name.class.jsx, + , entity.name.type.class.jsx, settings @@ -1099,7 +1211,10 @@ name Class KeyWord scope - storage.type.class.js + + , storage.type.class.js, + , storage.type.class.jsx, + settings foreground @@ -1114,6 +1229,8 @@ , storage.type.extends.js, , storage.modifier.extends.js, + , storage.type.extends.jsx, + , storage.modifier.extends.jsx, settings