From f904dfea78674df7b1314f484126680ad826868f Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 10:55:34 +0300 Subject: [PATCH 1/9] Fix JS coloring --- themes/nord.json | 79 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 23 deletions(-) diff --git a/themes/nord.json b/themes/nord.json index 6c7cebd..8e4793a 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -813,7 +813,7 @@ } }, { - "name": "[JavaScript] Decorator", + "name": "[JavaScript] Decorators", "scope": [ "source.js punctuation.decorator", "source.js meta.decorator variable.other.readwrite", @@ -824,12 +824,66 @@ } }, { - "name": "[JavaScript] Meta Object-Literal Key", + "name": "[JavaScript] Object-literal keys", "scope": "source.js meta.object-literal.key", + "settings": { + "foreground": "#D8DEE9" + } + }, + { + "name": "[JavaScript] Object-literal functions", + "scope": "source.js meta.object-literal.key entity.name.function", "settings": { "foreground": "#88C0D0" } }, + { + "name": "[JavaScript] Type/Class", + "scope": [ + "source.js support.class", + "source.js support.type", + "source.js entity.name.type", + "source.js entity.name.class" + ], + "settings": { + "foreground": "#8FBCBB" + } + }, + { + "name": "[JavaScript] Static Class Support", + "scope": ["source.js support.constant.math", "source.js support.constant.dom", "source.js support.constant.json"], + "settings": { + "foreground": "#8FBCBB" + } + }, + { + "name": "[JavaScript] Variables", + "scope": "source.js support.variable", + "settings": { + "foreground": "#D8DEE9" + } + }, + { + "name": "[JavaScript] Variable Other Object", + "scope": "source.js variable.other.object", + "settings": { + "foreground": "#D8DEE9" + } + }, + { + "name": "[JavaScript] Variable Other Read-Write Alias", + "scope": "source.js variable.other.readwrite.alias", + "settings": { + "foreground": "#8FBCBB" + } + }, + { + "name": "[JavaScript] Support Type Primitive", + "scope": "source.js support.type.primitive", + "settings": { + "foreground": "#81A1C1" + } + }, { "name": "[JavaScript](JSDoc) Storage Type Class", "scope": "source.js storage.type.class.jsdoc", @@ -865,27 +919,6 @@ "foreground": "#D8DEE9" } }, - { - "name": "[JavaScript] Support Type Primitive", - "scope": "source.js support.type.primitive", - "settings": { - "foreground": "#81A1C1" - } - }, - { - "name": "[JavaScript] Variable Other Object", - "scope": "source.js variable.other.object", - "settings": { - "foreground": "#D8DEE9" - } - }, - { - "name": "[JavaScript] Variable Other Read-Write Alias", - "scope": "source.js variable.other.readwrite.alias", - "settings": { - "foreground": "#8FBCBB" - } - }, { "name": "[HTML] Constant Character Entity", "scope": "text.html.basic constant.character.entity.html", From a9170ef00b98e5dcdb1ba083032f9013fdadca31 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 10:56:32 +0300 Subject: [PATCH 2/9] Fix TS coloring --- themes/nord.json | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 8e4793a..c47f4ec 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -1187,6 +1187,70 @@ "foreground": "#D8DEE9" } }, + { + "name": "[TypeScript] Variable Other Object", + "scope": ["source.ts variable.other.object", "source.tsx variable.other.object"], + "settings": { + "foreground": "#D8DEE9" + } + }, + { + "name": "[TypeScript] Variable Other Read-Write Alias", + "scope": ["source.ts variable.other.readwrite.alias", "source.tsx variable.other.readwrite.alias"], + "settings": { + "foreground": "#8FBCBB" + } + }, + { + "name": "[TypeScript] Support Type Primitive", + "scope": ["source.ts support.type.primitive", "source.tsx support.type.primitive"], + "settings": { + "foreground": "#81A1C1" + } + }, + { + "name": "[TypeScript](JSDoc) Storage Type Class", + "scope": ["source.ts storage.type.class.jsdoc", "source.tsx storage.type.class.jsdoc"], + "settings": { + "foreground": "#8FBCBB" + } + }, + { + "name": "[TypeScript] String Template Literals Punctuation", + "scope": [ + "source.ts string.quoted.template punctuation.quasi.element.begin", + "source.ts string.quoted.template punctuation.quasi.element.end", + "source.ts string.template punctuation.definition.template-expression", + "source.tsx string.quoted.template punctuation.quasi.element.begin", + "source.tsx string.quoted.template punctuation.quasi.element.end", + "source.tsx string.template punctuation.definition.template-expression" + ], + "settings": { + "foreground": "#81A1C1" + } + }, + { + "name": "[TypeScript] Interpolated String Template Punctuation Functions", + "scope": [ + "source.ts string.quoted.template meta.method-call.with-arguments", + "source.tsx string.quoted.template meta.method-call.with-arguments" + ], + "settings": { + "foreground": "#ECEFF4" + } + }, + { + "name": "[TypeScript] String Template Literal Variable", + "scope": [ + "source.ts string.template meta.template.expression support.variable.property", + "source.ts string.template meta.template.expression variable.other.object", + "source.tsx string.template meta.template.expression support.variable.property", + "source.tsx string.template meta.template.expression variable.other.object" + ], + "settings": { + "foreground": "#D8DEE9" + } + }, { "name": "[XML] Entity Name Tag Namespace", "scope": "text.xml entity.name.tag.namespace", From c1278eb24dec72c2d611cb421274db1e7f806ba9 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 10:58:27 +0300 Subject: [PATCH 3/9] Remove bold from Entity Other Inherited Class --- themes/nord.json | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/nord.json b/themes/nord.json index c47f4ec..8db4958 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -331,7 +331,6 @@ "name": "Entity Other Inherited Class", "scope": "entity.other.inherited-class", "settings": { - "fontStyle": "bold", "foreground": "#8FBCBB" } }, From c455389aede718ad3d15980a4592ef61660257f4 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 11:13:29 +0300 Subject: [PATCH 4/9] Add JSX inner text scope for JS --- themes/nord.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 8db4958..50540f6 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -811,6 +811,13 @@ "foreground": "#81A1C1" } }, + { + "name": "[JavaScript] JSX inner text", + "scope": "source.js meta.jsx.children", + "settings": { + "foreground": "#D8DEE9" + } + }, { "name": "[JavaScript] Decorators", "scope": [ From a54bb49740dad2f765c754edde588ebe2d9cbde4 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 11:14:18 +0300 Subject: [PATCH 5/9] Add JSX inner text scope for TS --- themes/nord.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 50540f6..44f7f92 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -1125,6 +1125,13 @@ "fontStyle": "italic" } }, + { + "name": "[TypeScript] JSX inner text", + "scope": "source.tsx meta.jsx.children", + "settings": { + "foreground": "#D8DEE9" + } + }, { "name": "[TypeScript] Decorators", "scope": [ From 20ebca6f1f5500de8574525ff00635b03617a4f9 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 11:18:38 +0300 Subject: [PATCH 6/9] Add Node.js global variables support for JS --- themes/nord.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 44f7f92..3083421 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -811,6 +811,13 @@ "foreground": "#81A1C1" } }, + { + "name": "[JavaScript] Node.js global variables", + "scope": ["source.js support.variable.object.process", "source.js support.variable.object.node"], + "settings": { + "foreground": "#8FBCBB" + } + }, { "name": "[JavaScript] JSX inner text", "scope": "source.js meta.jsx.children", From da262b1f5024cd2644eb0816f0efd54ba27d1026 Mon Sep 17 00:00:00 2001 From: svipas Date: Thu, 13 Jun 2019 11:19:45 +0300 Subject: [PATCH 7/9] Add Node.js global variables support for TS --- themes/nord.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 3083421..1153c64 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -1132,6 +1132,18 @@ "fontStyle": "italic" } }, + { + "name": "[TypeScript] Node.js global variables", + "scope": [ + "source.ts support.variable.object.process", + "source.ts support.variable.object.node", + "source.tsx support.variable.object.process", + "source.tsx support.variable.object.node" + ], + "settings": { + "foreground": "#8FBCBB" + } + }, { "name": "[TypeScript] JSX inner text", "scope": "source.tsx meta.jsx.children", From dda9d320a78829fcb65277aa766df8a23108270b Mon Sep 17 00:00:00 2001 From: svipas Date: Fri, 14 Jun 2019 22:34:33 +0300 Subject: [PATCH 8/9] Add missing meta.brace.round scope --- themes/nord.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 1153c64..6a5c27a 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -413,6 +413,13 @@ "foreground": "#ECEFF4" } }, + { + "name": "Meta Brace Round", + "scope": "meta.brace.round", + "settings": { + "foreground": "#ECEFF4" + } + }, { "name": "Punctuation Definition Parameters", "scope": [ From fe4c19058834d825dd21cac23663c5215b756795 Mon Sep 17 00:00:00 2001 From: svipas Date: Sat, 15 Jun 2019 15:15:43 +0300 Subject: [PATCH 9/9] Add missing meta.brace.square scope --- themes/nord.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/nord.json b/themes/nord.json index 6a5c27a..0a82f32 100644 --- a/themes/nord.json +++ b/themes/nord.json @@ -420,6 +420,13 @@ "foreground": "#ECEFF4" } }, + { + "name": "Meta Brace Square", + "scope": "meta.brace.square", + "settings": { + "foreground": "#ECEFF4" + } + }, { "name": "Punctuation Definition Parameters", "scope": [