From 264655fea379bf3eab12255069913d58ab0e89ed Mon Sep 17 00:00:00 2001 From: Armando Aguirre Date: Mon, 6 Feb 2023 12:55:56 -0800 Subject: [PATCH] Updates tmThemes to match latest VSCode colors (#959) * Updated themes to match latest VSCode colors * Fixed PR comments * Removed empty scope * Updated tmTheme --------- Co-authored-by: Armando Aguirre --- TypeScript.YAML-tmTheme | 27 ++++++++++--- TypeScript.tmTheme | 73 ++++++++++++++++++++++++++++++++--- TypeScriptReact.YAML-tmTheme | 2 +- TypeScriptReact.tmTheme | 75 +++++++++++++++++++++++++++++++++--- 4 files changed, 160 insertions(+), 17 deletions(-) diff --git a/TypeScript.YAML-tmTheme b/TypeScript.YAML-tmTheme index a033bd5..2d99c80 100644 --- a/TypeScript.YAML-tmTheme +++ b/TypeScript.YAML-tmTheme @@ -5,10 +5,14 @@ name: TypeScript uuid: 91489F9C-F403-4CF0-993D-EAAF9149E40E settings: -- scope: storage.modifier, storage.type, keyword.control, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression +- scope: storage.modifier, storage.type, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression settings: { vsclassificationtype: keyword } -- scope: support.type, constant.language, variable.language, variable.language variable.parameter +- scope: constant.language, variable.language settings: { vsclassificationtype: keyword } +- scope: keyword.control, keyword.operator.expression.delete, keyword.other.using, keyword.other.operator, entity.name.operator + settings: { vsclassificationtype: keyword - control } +- scope: support.class, support.type, entity.name.type, entity.name.namespace, entity.other.attribute, entity.name.scope-resolution, entity.name.class + settings: { vsclassificationtype: type } - scope: string, punctuation.definition.string, constant.character settings: { vsclassificationtype: string } @@ -42,8 +46,12 @@ settings: - scope: entity.name.type.enum.ts settings: { vsclassificationtype: enum name } -- scope: entity.name.function, entity.name.type, meta.template.expression.ts, variable, entity.other.inherited-class.ts +- scope: meta.template.expression.ts, entity.other.inherited-class.ts settings: { vsclassificationtype: identifier } +- scope: variable, meta.definition.variable.name, support.variable, entity.name.variable, constant.other.placeholder + settings: { vsclassificationtype: local name } +- scope: entity.name.function, support.function, support.constant.handlebars, source.powershell variable.other.member, entity.name.operator.custom-literal + settings: { vsclassificationtype: method name } - scope: constant.language.undefined.ts, variable.language.arguments.ts, support.type.object settings: { vsclassificationtype: identifier } @@ -54,6 +62,15 @@ settings: - scope: entity.other.attribute-name settings: { vsclassificationtype: HTML Attribute Name } -- scope: meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted constant.character.escape - settings: { vsclassificationtype: HTML Attribute Value } +- scope: meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted + settings: { vsclassificationtype: string } + +- scope: meta.object-literal.key + settings: { vsclassificationtype: parameter name } + +- scope: constant.character.escape + settings: { vsclassificationtype: string - escape character } + +- scope: entity.name.label + settings: { vsclassificationtype: label name } ... diff --git a/TypeScript.tmTheme b/TypeScript.tmTheme index 9517d85..415c0dc 100644 --- a/TypeScript.tmTheme +++ b/TypeScript.tmTheme @@ -10,7 +10,7 @@ scope - storage.modifier, storage.type, keyword.control, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression + storage.modifier, storage.type, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression settings vsclassificationtype @@ -19,13 +19,31 @@ scope - support.type, constant.language, variable.language, variable.language variable.parameter + constant.language, variable.language settings vsclassificationtype keyword + + scope + keyword.control, keyword.operator.expression.delete, keyword.other.using, keyword.other.operator, entity.name.operator + settings + + vsclassificationtype + keyword - control + + + + scope + support.class, support.type, entity.name.type, entity.name.namespace, entity.other.attribute, entity.name.scope-resolution, entity.name.class + settings + + vsclassificationtype + type + + scope string, punctuation.definition.string, constant.character @@ -136,13 +154,31 @@ scope - entity.name.function, entity.name.type, meta.template.expression.ts, variable, entity.other.inherited-class.ts + meta.template.expression.ts, entity.other.inherited-class.ts settings vsclassificationtype identifier + + scope + variable, meta.definition.variable.name, support.variable, entity.name.variable, constant.other.placeholder + settings + + vsclassificationtype + local name + + + + scope + entity.name.function, support.function, support.constant.handlebars, source.powershell variable.other.member, entity.name.operator.custom-literal + settings + + vsclassificationtype + method name + + scope constant.language.undefined.ts, variable.language.arguments.ts, support.type.object @@ -172,11 +208,38 @@ scope - meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted constant.character.escape + meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted settings vsclassificationtype - HTML Attribute Value + string + + + + scope + meta.object-literal.key + settings + + vsclassificationtype + parameter name + + + + scope + constant.character.escape + settings + + vsclassificationtype + string - escape character + + + + scope + entity.name.label + settings + + vsclassificationtype + label name diff --git a/TypeScriptReact.YAML-tmTheme b/TypeScriptReact.YAML-tmTheme index c93ae36..a934f8e 100644 --- a/TypeScriptReact.YAML-tmTheme +++ b/TypeScriptReact.YAML-tmTheme @@ -13,7 +13,7 @@ settings: - scope: meta.jsx.children.tsx, constant.character.entity.tsx, punctuation.definition.entity.tsx, invalid.illegal.bad-ampersand.tsx settings: { vsclassificationtype: xml literal - text } -- scope: invalid.illegal.attribute.tsx, meta.embedded.expression.tsx +- scope: invalid.illegal.attribute.tsx settings: { vsclassificationtype: identifier } ... diff --git a/TypeScriptReact.tmTheme b/TypeScriptReact.tmTheme index 4e38825..35b73c1 100644 --- a/TypeScriptReact.tmTheme +++ b/TypeScriptReact.tmTheme @@ -10,7 +10,7 @@ scope - storage.modifier, storage.type, keyword.control, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression + storage.modifier, storage.type, keyword.other, keyword.operator.expression, keyword.operator.new, keyword.generator.asterisk, punctuation.definition.template-expression settings vsclassificationtype @@ -19,13 +19,31 @@ scope - support.type, constant.language, variable.language, variable.language variable.parameter + constant.language, variable.language settings vsclassificationtype keyword + + scope + keyword.control, keyword.operator.expression.delete, keyword.other.using, keyword.other.operator, entity.name.operator + settings + + vsclassificationtype + keyword - control + + + + scope + support.class, support.type, entity.name.type, entity.name.namespace, entity.other.attribute, entity.name.scope-resolution, entity.name.class + settings + + vsclassificationtype + type + + scope string, punctuation.definition.string, constant.character @@ -136,13 +154,31 @@ scope - entity.name.function, entity.name.type, meta.template.expression.tsx, variable, entity.other.inherited-class.tsx + meta.template.expression.tsx, entity.other.inherited-class.tsx settings vsclassificationtype identifier + + scope + variable, meta.definition.variable.name, support.variable, entity.name.variable, constant.other.placeholder + settings + + vsclassificationtype + local name + + + + scope + entity.name.function, support.function, support.constant.handlebars, source.powershell variable.other.member, entity.name.operator.custom-literal + settings + + vsclassificationtype + method name + + scope constant.language.undefined.tsx, variable.language.arguments.tsx, support.type.object @@ -172,11 +208,38 @@ scope - meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted constant.character.escape + meta.tag string.quoted, meta.tag string.quoted punctuation.definition.string, meta.tag string.quoted settings vsclassificationtype - HTML Attribute Value + string + + + + scope + meta.object-literal.key + settings + + vsclassificationtype + parameter name + + + + scope + constant.character.escape + settings + + vsclassificationtype + string - escape character + + + + scope + entity.name.label + settings + + vsclassificationtype + label name @@ -199,7 +262,7 @@ scope - invalid.illegal.attribute.tsx, meta.embedded.expression.tsx + invalid.illegal.attribute.tsx settings vsclassificationtype