From 18eb464e56521f9ed6af10fce9b435ce813c3e1e Mon Sep 17 00:00:00 2001
From: chbk <chbk.git@gmail.com>
Date: Fri, 21 Feb 2025 19:49:02 +0100
Subject: [PATCH] Add syntax scopes to themes

---
 assets/themes/ayu/ayu.json         |  93 ++++++++++----
 assets/themes/gruvbox/gruvbox.json | 198 +++++++++++++++++++++--------
 assets/themes/one/one.json         |  62 ++++++---
 3 files changed, 259 insertions(+), 94 deletions(-)

diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index 745eb2b4c27332..3d0392905296bd 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -236,6 +236,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#bfbdb6ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#628b80ff",
             "font_style": null,
@@ -251,12 +256,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#fe8f40ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#aad84cff",
             "font_style": null,
             "font_weight": null
@@ -306,7 +311,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#a6a5a0ff",
             "font_style": null,
             "font_weight": null
@@ -316,6 +321,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#fe8f40ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#5ac1feff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#5ac1feff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#a9d94bff",
             "font_style": null,
@@ -346,11 +366,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#fe8f40ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#bfbdb6ff",
             "font_style": null,
@@ -607,6 +622,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#5c6166ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8ca7c2ff",
             "font_style": null,
@@ -622,12 +642,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#f98d3fff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#85b304ff",
             "font_style": null,
             "font_weight": null
@@ -677,7 +697,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#73777bff",
             "font_style": null,
             "font_weight": null
@@ -687,6 +707,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#f98d3fff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#3b9ee5ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#3b9ee5ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#86b300ff",
             "font_style": null,
@@ -717,11 +752,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#f98d3fff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#5c6166ff",
             "font_style": null,
@@ -978,6 +1008,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#cccac2ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#7399a3ff",
             "font_style": null,
@@ -993,12 +1028,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#fead66ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#d5fe80ff",
             "font_style": null,
             "font_weight": null
@@ -1048,7 +1083,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#b4b3aeff",
             "font_style": null,
             "font_weight": null
@@ -1058,6 +1093,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#fead66ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#72cffeff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#72cffeff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#d4fe7fff",
             "font_style": null,
@@ -1088,11 +1138,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#fead66ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#cccac2ff",
             "font_style": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index 958cf4797dc6f4..0afc2d987542bd 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -253,6 +253,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -268,12 +273,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#8ec07cff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#d3869bff",
             "font_style": null,
             "font_weight": null
@@ -323,8 +328,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -333,6 +338,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#8ec07cff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -363,11 +383,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -641,6 +656,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -656,12 +676,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#8ec07cff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#d3869bff",
             "font_style": null,
             "font_weight": null
@@ -711,8 +731,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -721,6 +741,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#8ec07cff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -751,11 +786,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -1029,6 +1059,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#b8bb25ff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#8c957dff",
             "font_style": null,
@@ -1044,12 +1079,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#8ec07cff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#d3869bff",
             "font_style": null,
             "font_weight": null
@@ -1099,8 +1134,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
+          "punctuation.markup": {
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1109,6 +1144,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#8ec07cff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#83a598ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -1139,11 +1189,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#b8bb25ff",
             "font_style": null,
@@ -1417,6 +1462,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -1432,12 +1482,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#427b58ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#8f3e71ff",
             "font_style": null,
             "font_weight": null
@@ -1487,8 +1537,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1497,6 +1547,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#427b58ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
@@ -1527,11 +1592,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#79740eff",
             "font_style": null,
@@ -1805,6 +1865,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -1820,12 +1885,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#427b58ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#8f3e71ff",
             "font_style": null,
             "font_weight": null
@@ -1875,8 +1940,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1885,6 +1950,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#427b58ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
@@ -1915,11 +1995,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#79740eff",
             "font_style": null,
@@ -2193,6 +2268,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#79740eff",
+            "font_style": null,
+            "font_weight": 700
+          },
           "hint": {
             "color": "#677562ff",
             "font_style": null,
@@ -2208,12 +2288,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#427b58ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#8f3e71ff",
             "font_style": null,
             "font_weight": null
@@ -2263,8 +2343,8 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
+          "punctuation.markup": {
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -2273,6 +2353,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#066578ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#427b58ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#0b6678ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#79740eff",
             "font_style": null,
@@ -2303,11 +2398,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#79740eff",
             "font_style": null,
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 9d7a29cd957783..3b75eef5e3f76f 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -239,6 +239,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#d07277ff",
+            "font_style": null,
+            "font_weight": 400
+          },
           "hint": {
             "color": "#788ca6ff",
             "font_style": null,
@@ -254,12 +259,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#73ade9ff",
             "font_style": "normal",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#6eb4bfff",
             "font_style": null,
             "font_weight": null
@@ -309,7 +314,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#d07277ff",
             "font_style": null,
             "font_weight": null
@@ -319,6 +324,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#a1c181ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#d07277ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#74ade8ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#a1c181ff",
             "font_style": null,
@@ -349,11 +369,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#a1c181ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#d07277ff",
             "font_style": null,
@@ -618,6 +633,11 @@
             "font_style": null,
             "font_weight": null
           },
+          "heading": {
+            "color": "#d3604fff",
+            "font_style": null,
+            "font_weight": 400
+          },
           "hint": {
             "color": "#7274a7ff",
             "font_style": null,
@@ -633,12 +653,12 @@
             "font_style": null,
             "font_weight": null
           },
-          "link_text": {
+          "link": {
             "color": "#5b79e3ff",
             "font_style": "italic",
             "font_weight": null
           },
-          "link_uri": {
+          "link.uri": {
             "color": "#3882b7ff",
             "font_style": null,
             "font_weight": null
@@ -688,7 +708,7 @@
             "font_style": null,
             "font_weight": null
           },
-          "punctuation.list_marker": {
+          "punctuation.markup": {
             "color": "#d3604fff",
             "font_style": null,
             "font_weight": null
@@ -698,6 +718,21 @@
             "font_style": null,
             "font_weight": null
           },
+          "raw": {
+            "color": "#649f57ff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "selector": {
+            "color": "#d3604fff",
+            "font_style": null,
+            "font_weight": null
+          },
+          "strikethrough": {
+            "color": "#5c78e2ff",
+            "font_style": null,
+            "font_weight": null
+          },
           "string": {
             "color": "#649f57ff",
             "font_style": null,
@@ -728,11 +763,6 @@
             "font_style": null,
             "font_weight": null
           },
-          "text.literal": {
-            "color": "#649f57ff",
-            "font_style": null,
-            "font_weight": null
-          },
           "title": {
             "color": "#d3604fff",
             "font_style": null,