From df798c1a7f4631ba1972d5b47efcb88788c23d5d Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Mon, 27 Feb 2023 10:52:53 -0500
Subject: [PATCH] Remove `punctuation.special` until bug is fixed

---
 styles/src/themes/andromeda.ts | 16 +++++++++-------
 styles/src/themes/one-dark.ts  | 34 +++++++++++++++++-----------------
 styles/src/themes/one-light.ts | 30 +++++++++++++++---------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/styles/src/themes/andromeda.ts b/styles/src/themes/andromeda.ts
index 7935e49d78aa3ac00979f35a0ab401a836c4200d..1fb5448eb6c27dd513f0ce866a7ec033a0da3997 100644
--- a/styles/src/themes/andromeda.ts
+++ b/styles/src/themes/andromeda.ts
@@ -41,25 +41,27 @@ const ramps = {
 }
 
 const syntax: ThemeSyntax = {
-    variable: { color: color.cyan },
+    "punctuation.list_marker": { color: color.yellow },
+    "text.literal": { color: color.green },
     "variable.special": { color: color.cyan },
-    "punctuation.special": { color: color.red },
     attribute: { color: color.text },
     boolean: { color: color.red },
     comment: { color: color.gray },
     function: { color: color.yellow },
     keyword: { color: color.purple },
+    linkText: { color: color.red },
+    linkUri: { color: color.purple },
     number: { color: color.orange },
     operator: { color: color.red },
     primary: { color: color.text },
     property: { color: color.text },
     string: { color: color.green },
-    type: { color: color.yellow },
     title: { color: color.hotPink },
-    linkText: { color: color.red },
-    linkUri: { color: color.purple },
-    "text.literal": { color: color.green },
-    "punctuation.list_marker": { color: color.yellow },
+    type: { color: color.yellow },
+    variable: { color: color.cyan },
+
+    // TODO: uncomment this once the bug with styling curly braces in template literals is fixed
+    // "punctuation.special": { color: color.red },
 }
 
 export const dark = createColorScheme(`${name}`, false, ramps, syntax)
diff --git a/styles/src/themes/one-dark.ts b/styles/src/themes/one-dark.ts
index 65d8f3e20b0c141f45648dde68a62a021a30a7c9..56a8399a829f705af5714b2df2c69ae0dc52a350 100644
--- a/styles/src/themes/one-dark.ts
+++ b/styles/src/themes/one-dark.ts
@@ -42,29 +42,29 @@ const ramps = {
 }
 
 const syntax: ThemeSyntax = {
-    primary: { color: color.white },
+    "emphasis.strong": { color: color.orange },
+    "punctuation.list_marker": { color: color.red },
+    "text.literal": { color: color.green },
+    "variable.special": { color: color.orange },
+    boolean: { color: color.orange },
     comment: { color: color.grey },
+    enum: { color: color.red },
     function: { color: color.blue },
-    type: { color: color.teal },
-    property: { color: color.red },
+    keyword: { color: color.purple },
+    linkText: { color: color.blue, italic: false },
+    linkUri: { color: color.teal },
     number: { color: color.orange },
+    operator: { color: color.teal },
+    primary: { color: color.white },
+    property: { color: color.red },
+    punctuation: { color: color.white },
     string: { color: color.green },
-    "text.literal": { color: color.green },
-    keyword: { color: color.purple },
-    boolean: { color: color.orange },
     title: { color: color.red, weight: fontWeights.normal },
-    punctuation: { color: color.white },
-    "punctuation.special": { color: color.darkRed },
-    "punctuation.list_marker": { color: color.red },
-    operator: { color: color.teal },
-    "variable.special": { color: color.orange },
+    type: { color: color.teal },
     variant: { color: color.blue },
-    enum: { color: color.red },
-    "emphasis.strong": {
-        color: color.orange,
-    },
-    linkText: { color: color.blue, italic: false },
-    linkUri: { color: color.teal },
+
+    // TODO: uncomment this once the bug with styling curly braces in template literals is fixed
+    // "punctuation.special": { color: color.darkRed },
 }
 
 export const dark = createColorScheme(name, false, ramps, syntax)
diff --git a/styles/src/themes/one-light.ts b/styles/src/themes/one-light.ts
index 91f66ec6eaaa7b04464917aa5cd0f23965be1dd8..1979206cb99b80e80af93c6b794583388e7a3ae9 100644
--- a/styles/src/themes/one-light.ts
+++ b/styles/src/themes/one-light.ts
@@ -42,26 +42,26 @@ const ramps = {
 }
 
 const syntax: ThemeSyntax = {
-    primary: { color: color.black },
-    "variable.special": { color: color.orange },
+    "emphasis.strong": { color: color.orange },
+    boolean: { color: color.orange },
     comment: { color: color.grey },
-    punctuation: { color: color.black },
-    keyword: { color: color.purple },
-    function: { color: color.blue },
-    type: { color: color.teal },
-    variant: { color: color.blue },
-    property: { color: color.red },
     enum: { color: color.red },
+    function: { color: color.blue },
+    keyword: { color: color.purple },
+    linkText: { color: color.blue },
+    linkUri: { color: color.teal },
+    number: { color: color.orange },
     operator: { color: color.teal },
+    primary: { color: color.black },
+    property: { color: color.red },
+    punctuation: { color: color.black },
     string: { color: color.green },
-    number: { color: color.orange },
-    boolean: { color: color.orange },
     title: { color: color.red, weight: fontWeights.normal },
-    "emphasis.strong": {
-        color: color.orange,
-    },
-    linkText: { color: color.blue },
-    linkUri: { color: color.teal },
+    type: { color: color.teal },
+    variant: { color: color.blue },
+
+    // TODO: uncomment this once the bug with styling curly braces in template literals is fixed
+    // "variable.special": { color: color.orange },
 }
 
 export const light = createColorScheme(name, true, ramps, syntax)