Define catch-all keywords and operators token accent colors

Also some golang-specific accents. v.0.3.9 fix #19
santoso-wijaya · May 30, 2024 · 28c017d · 28c017d
1 parent 72f855e
commit 28c017d
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Change Log
 
-## 0.3.9 | TODO
+## 0.3.9 | 2024-05-30
 
 * Fix workbench's editor sticky scroll backgrounds and shadow.
+* Define catch-all keywords and operators token highlight colors.
+* Define golang-specific accent color (green).
 
 ## 0.3.8 | 2024-05-30
 

diff --git a/themes/Selenized_Dark-color-theme.json b/themes/Selenized_Dark-color-theme.json
@@ -231,13 +231,20 @@
     "name": "Keywords",
     "scope": [
       "keyword.control",
-      "keyword.operator",
-      "keyword.other"
+      "keyword.other",
+      "keyword"
     ],
     "settings": {
       "foreground": "#e3b230"
     }
   },
+  {
+    "name": "Operators",
+    "scope": "keyword.operator",
+    "settings": {
+      "foreground": "#adbcbc"
+    }
+  },
   {
     "name": "Language Constants",
     "scope": [
@@ -255,7 +262,8 @@
       "variable.parameter",
       "variable.other.readwrite",
       "support.variable",
-      "entity.name.variable"
+      "entity.name.variable",
+      "variable"
     ],
     "settings": {
       "foreground": "#adbcbc"
@@ -359,7 +367,8 @@
   {
     "name": "Namespace",
     "scope": [
-      "entity.name.namespace"
+      "entity.name.namespace",
+      "entity.name.type.package.go",
     ],
     "settings": {
       "foreground": "#f176bd"
@@ -376,6 +385,18 @@
       "foreground": "#f38649"
     }
   },
+  {
+    "name": "Golang - misc",
+    "scope": [
+      "entity.name.import.go",
+      "entity.name.type.go",
+      "variable.other.assignment.go",
+      "variable.other.go"
+    ],
+    "settings": {
+      "foreground": "#80b83c"
+    }
+  },
   {
     "name": "Exceptions",
     "scope": "entity.name.exception",
@@ -744,6 +765,7 @@
 
   "*.defaultLibrary": { "italic": true },
   "decorator": "#adbcbc",
+  "operator": "#adbcbc",
   "variable.mutable": { "underline": true },
   "const.constant": "#39c7b9",
   "type.declaration": "#f38649",

diff --git a/themes/Selenized_Light-color-theme.json b/themes/Selenized_Light-color-theme.json
@@ -231,13 +231,20 @@
     "name": "Keywords",
     "scope": [
       "keyword.control",
-      "keyword.operator",
-      "keyword.other"
+      "keyword.other",
+      "keyword"
     ],
     "settings": {
       "foreground": "#b38800"
     }
   },
+  {
+    "name": "Operators",
+    "scope": "keyword.operator",
+    "settings": {
+      "foreground": "#52666d"
+    }
+  },
   {
     "name": "Language Constants",
     "scope": [
@@ -255,7 +262,8 @@
       "variable.parameter",
       "variable.other.readwrite",
       "support.variable",
-      "entity.name.variable"
+      "entity.name.variable",
+      "variable"
     ],
     "settings": {
       "foreground": "#52666d"
@@ -359,7 +367,8 @@
   {
     "name": "Namespace",
     "scope": [
-      "entity.name.namespace"
+      "entity.name.namespace",
+      "entity.name.type.package.go",
     ],
     "settings": {
       "foreground": "#cb4c99"
@@ -376,6 +385,18 @@
       "foreground": "#c75d20"
     }
   },
+  {
+    "name": "Golang - misc",
+    "scope": [
+      "entity.name.import.go",
+      "entity.name.type.go",
+      "variable.other.assignment.go",
+      "variable.other.go"
+    ],
+    "settings": {
+      "foreground": "#539100"
+    }
+  },
   {
     "name": "Exceptions",
     "scope": "entity.name.exception",
@@ -744,6 +765,7 @@
 
   "*.defaultLibrary": { "italic": true },
   "decorator": "#52666d",
+  "operator": "#52666d",
   "variable.mutable": { "underline": true },
   "const.constant": "#009c8f",
   "type.declaration": "#c75d20",

diff --git a/themes/Solarized_Dark-color-theme.json b/themes/Solarized_Dark-color-theme.json
@@ -231,13 +231,20 @@
     "name": "Keywords",
     "scope": [
       "keyword.control",
-      "keyword.operator",
-      "keyword.other"
+      "keyword.other",
+      "keyword"
     ],
     "settings": {
       "foreground": "#bb8801"
     }
   },
+  {
+    "name": "Operators",
+    "scope": "keyword.operator",
+    "settings": {
+      "foreground": "#829496"
+    }
+  },
   {
     "name": "Language Constants",
     "scope": [
@@ -255,7 +262,8 @@
       "variable.parameter",
       "variable.other.readwrite",
       "support.variable",
-      "entity.name.variable"
+      "entity.name.variable",
+      "variable"
     ],
     "settings": {
       "foreground": "#829496"
@@ -359,7 +367,8 @@
   {
     "name": "Namespace",
     "scope": [
-      "entity.name.namespace"
+      "entity.name.namespace",
+      "entity.name.type.package.go",
     ],
     "settings": {
       "foreground": "#f2579c"
@@ -376,6 +385,18 @@
       "foreground": "#cf4b15"
     }
   },
+  {
+    "name": "Golang - misc",
+    "scope": [
+      "entity.name.import.go",
+      "entity.name.type.go",
+      "variable.other.assignment.go",
+      "variable.other.go"
+    ],
+    "settings": {
+      "foreground": "#8d9800"
+    }
+  },
   {
     "name": "Exceptions",
     "scope": "entity.name.exception",
@@ -744,6 +765,7 @@
 
   "*.defaultLibrary": { "italic": true },
   "decorator": "#829496",
+  "operator": "#829496",
   "variable.mutable": { "underline": true },
   "const.constant": "#1fa198",
   "type.declaration": "#cf4b15",

diff --git a/themes/Solarized_Light-color-theme.json b/themes/Solarized_Light-color-theme.json
@@ -231,13 +231,20 @@
     "name": "Keywords",
     "scope": [
       "keyword.control",
-      "keyword.operator",
-      "keyword.other"
+      "keyword.other",
+      "keyword"
     ],
     "settings": {
       "foreground": "#bb8801"
     }
   },
+  {
+    "name": "Operators",
+    "scope": "keyword.operator",
+    "settings": {
+      "foreground": "#637b82"
+    }
+  },
   {
     "name": "Language Constants",
     "scope": [
@@ -255,7 +262,8 @@
       "variable.parameter",
       "variable.other.readwrite",
       "support.variable",
-      "entity.name.variable"
+      "entity.name.variable",
+      "variable"
     ],
     "settings": {
       "foreground": "#637b82"
@@ -359,7 +367,8 @@
   {
     "name": "Namespace",
     "scope": [
-      "entity.name.namespace"
+      "entity.name.namespace",
+      "entity.name.type.package.go",
     ],
     "settings": {
       "foreground": "#f2579c"
@@ -376,6 +385,18 @@
       "foreground": "#cf4b15"
     }
   },
+  {
+    "name": "Golang - misc",
+    "scope": [
+      "entity.name.import.go",
+      "entity.name.type.go",
+      "variable.other.assignment.go",
+      "variable.other.go"
+    ],
+    "settings": {
+      "foreground": "#8d9800"
+    }
+  },
   {
     "name": "Exceptions",
     "scope": "entity.name.exception",
@@ -744,6 +765,7 @@
 
   "*.defaultLibrary": { "italic": true },
   "decorator": "#637b82",
+  "operator": "#637b82",
   "variable.mutable": { "underline": true },
   "const.constant": "#1fa198",
   "type.declaration": "#cf4b15",

diff --git a/themes/common/semantic-token-colors.json.liquid b/themes/common/semantic-token-colors.json.liquid
@@ -112,6 +112,7 @@
 
   "*.defaultLibrary": { "italic": true },
   "decorator": "#{{ fg_0 }}",
+  "operator": "#{{ fg_0 }}",
   "variable.mutable": { "underline": true },
   "const.constant": "#{{ cyan }}",
   "type.declaration": "#{{ orange }}",

diff --git a/themes/common/token-colors.json.liquid b/themes/common/token-colors.json.liquid
@@ -90,13 +90,20 @@
     "name": "Keywords",
     "scope": [
       "keyword.control",
-      "keyword.operator",
-      "keyword.other"
+      "keyword.other",
+      "keyword"
     ],
     "settings": {
       "foreground": "#{{ yellow }}"
     }
   },
+  {
+    "name": "Operators",
+    "scope": "keyword.operator",
+    "settings": {
+      "foreground": "#{{ fg_0 }}"
+    }
+  },
   {
     "name": "Language Constants",
     "scope": [
@@ -114,7 +121,8 @@
       "variable.parameter",
       "variable.other.readwrite",
       "support.variable",
-      "entity.name.variable"
+      "entity.name.variable",
+      "variable"
     ],
     "settings": {
       "foreground": "#{{ fg_0 }}"
@@ -218,7 +226,8 @@
   {
     "name": "Namespace",
     "scope": [
-      "entity.name.namespace"
+      "entity.name.namespace",
+      "entity.name.type.package.go",
     ],
     "settings": {
       "foreground": "#{{ magenta }}"
@@ -235,6 +244,18 @@
       "foreground": "#{{ orange }}"
     }
   },
+  {
+    "name": "Golang - misc",
+    "scope": [
+      "entity.name.import.go",
+      "entity.name.type.go",
+      "variable.other.assignment.go",
+      "variable.other.go"
+    ],
+    "settings": {
+      "foreground": "#{{ green }}"
+    }
+  },
   {
     "name": "Exceptions",
     "scope": "entity.name.exception",