From 3d2dd8988de5c2d25884e8107315ed1e1c93fa23 Mon Sep 17 00:00:00 2001 From: Kristi Date: Mon, 4 Nov 2019 15:34:28 -0500 Subject: [PATCH] Update template tag and keyword colors --- themes/tokyo-night-color-theme.json | 47 +++++++++++----------- themes/tokyo-night-storm-color-theme.json | 48 ++++++++++++----------- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json index 2abc4c7..16fdc29 100644 --- a/themes/tokyo-night-color-theme.json +++ b/themes/tokyo-night-color-theme.json @@ -414,15 +414,32 @@ } }, { - "name": "Interpolation", + "name": "Interpolation, PHP tags, Smarty tags", "scope": [ "punctuation.definition.template-expression", - "punctuation.section.embedded" + "punctuation.section.embedded", + "meta.embedded.line.tag.smarty", + "support.constant.handlebars", + "punctuation.section.tag.twig", ], "settings": { "foreground": "#7dcfff" } }, + { + "name": "Blade, Twig, Smarty Handlebars keywords", + "scope": [ + "keyword.control.smarty", + "keyword.control.twig", + "support.constant.handlebars keyword.control", + "keyword.operator.comparison.twig", + "keyword.blade", + "entity.name.function.blade" + ], + "settings": { + "foreground": "#0db9d7" + } + }, { "name": "Spread", "scope": [ @@ -442,6 +459,9 @@ "keyword.other", "keyword.operator.bitwise.shift", "punctuation", + "text.html.twig meta.tag.inline.any.html", + "meta.tag.template.value.twig meta.function.arguments.twig", + "meta.directive.vue punctuation.separator.key-value.html", "punctuation.definition.constant.markdown", "punctuation.definition.string", "punctuation.support.type.property-name", @@ -525,16 +545,6 @@ "foreground": "#ba3c97" } }, - { - "name": "Blade", - "scope": [ - "keyword.blade", - "entity.name.function.blade" - ], - "settings": { - "foreground": "#7aa2f7" - } - }, { "name": "Globals, PHP Constants, etc", "scope": [ @@ -554,7 +564,8 @@ "scope": [ "variable", "support.variable", - "string constant.other.placeholder" + "string constant.other.placeholder", + "variable.parameter.handlebars" ], "settings": { "foreground": "#c0caf5" @@ -657,7 +668,7 @@ "meta.function.parameter variable" ], "settings": { - "foreground": "#e0af68" + "foreground": "#e0af68" //#73daca } }, { @@ -918,7 +929,6 @@ { "name": "Vue Template attributes", "scope": [ - "meta.directive.vue punctuation.separator.key-value.html", "entity.other.attribute-name.id.html", "meta.directive.vue entity.other.attribute-name.html" ], @@ -926,13 +936,6 @@ "foreground": "#bb9af7" } }, - { - "name": "Vue Template attribute separator", - "scope": "meta.directive.vue punctuation.separator.key-value.html", - "settings": { - "foreground": "#89ddff" - } - }, { "name": "CSS ID's", "scope": "source.sass keyword.control", diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json index 1c3e1e7..9a6077d 100644 --- a/themes/tokyo-night-storm-color-theme.json +++ b/themes/tokyo-night-storm-color-theme.json @@ -413,15 +413,32 @@ } }, { - "name": "Interpolation", + "name": "Interpolation / PHP tags / Smarty tags", "scope": [ "punctuation.definition.template-expression", - "punctuation.section.embedded" + "punctuation.section.embedded", + "meta.embedded.line.tag.smarty", + "support.constant.handlebars", + "punctuation.section.tag.twig" ], "settings": { "foreground": "#7dcfff" } }, + { + "name": "Twig, Smarty, Blade, Handlebars keyword", + "scope": [ + "keyword.control.smarty", + "keyword.control.twig", + "support.constant.handlebars keyword.control", + "keyword.operator.comparison.twig", + "keyword.blade", + "entity.name.function.blade" + ], + "settings": { + "foreground": "#2ac3de" + } + }, { "name": "Spread", "scope": [ @@ -441,6 +458,9 @@ "keyword.other", "keyword.operator.bitwise.shift", "punctuation", + "text.html.twig meta.tag.inline.any.html", + "meta.tag.template.value.twig meta.function.arguments.twig", + "meta.directive.vue punctuation.separator.key-value.html", "punctuation.definition.constant.markdown", "punctuation.definition.string", "punctuation.support.type.property-name", @@ -524,16 +544,6 @@ "foreground": "#ba3c97" } }, - { - "name": "Blade", - "scope": [ - "keyword.blade", - "entity.name.function.blade" - ], - "settings": { - "foreground": "#7aa2f7" - } - }, { "name": "Globals, PHP Constants, etc", "scope": [ @@ -553,7 +563,8 @@ "scope": [ "variable", "support.variable", - "string constant.other.placeholder" + "string constant.other.placeholder", + "variable.parameter.handlebars" ], "settings": { "foreground": "#c0caf5" @@ -657,7 +668,7 @@ "meta.function.parameter variable" ], "settings": { - "foreground": "#e0af68" + "foreground": "#e0af68" //#73daca } }, { @@ -910,6 +921,7 @@ "entity.other.attribute-name", "text.html.basic entity.other.attribute-name.html", "text.html.basic entity.other.attribute-name" + ], "settings": { "foreground": "#bb9af7" @@ -918,7 +930,6 @@ { "name": "Vue Template attributes", "scope": [ - "meta.directive.vue punctuation.separator.key-value.html", "entity.other.attribute-name.id.html", "meta.directive.vue entity.other.attribute-name.html" ], @@ -926,13 +937,6 @@ "foreground": "#bb9af7" } }, - { - "name": "Vue Template attribute separator", - "scope": "meta.directive.vue punctuation.separator.key-value.html", - "settings": { - "foreground": "#89ddff" - } - }, { "name": "CSS ID's", "scope": "source.sass keyword.control",