oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add syntax scopes to themes (#25323)" (#25339)

Browse Source 
This reverts commit 2f416aebbe.

We shouldn't have merged this yet, as it currently breaks syntax
highlighting for some languages that haven't had their requisite changes
merged yet.

We also need to be aware of the impact this will have on downstream
themes.

@chbk We should bundle any changes to the themes with the specific
language highlights that depend on those changes (and if there are
multiple languages that need the same change then pick one language to
come first and then stack the rest of the changes on top of that).

Release Notes:

- Community: This is a revert of
https://github.com/zed-industries/zed/pull/25323, so remove those notes
from the release notes.
This commit is contained in:
Marshall Bowers
2025-02-21 15:12:12 +00:00
committed by GitHub
parent 2f416aebbe
commit ad4163b9be
3 changed files with 94 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/themes/ayu/ayu.json
+24 -99
View File
@@ -236,11 +236,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#bfbdb6ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#628b80ff",
"font_style": null,
@@ -256,21 +251,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#fe8f40ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#aad84cff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#bfbdb6ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#d2a6ffff",
"font_style": null,
@@ -316,7 +306,7 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"punctuation.list_marker": {
"color": "#a6a5a0ff",
"font_style": null,
"font_weight": null
@@ -326,21 +316,6 @@
"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,
@@ -371,6 +346,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#fe8f40ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#bfbdb6ff",
"font_style": null,
@@ -381,11 +361,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#59c2ffff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#bfbdb6ff",
"font_style": null,
@@ -632,11 +607,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#5c6166ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#8ca7c2ff",
"font_style": null,
@@ -652,21 +622,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#f98d3fff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#85b304ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#5c6166ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#a37accff",
"font_style": null,
@@ -712,7 +677,7 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"punctuation.list_marker": {
"color": "#73777bff",
"font_style": null,
"font_weight": null
@@ -722,21 +687,6 @@
"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,
@@ -767,6 +717,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#f98d3fff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#5c6166ff",
"font_style": null,
@@ -777,11 +732,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#389ee6ff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#5c6166ff",
"font_style": null,
@@ -1028,11 +978,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#cccac2ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#7399a3ff",
"font_style": null,
@@ -1048,21 +993,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#fead66ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#d5fe80ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#cccac2ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#dfbfffff",
"font_style": null,
@@ -1108,7 +1048,7 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"punctuation.list_marker": {
"color": "#b4b3aeff",
"font_style": null,
"font_weight": null
@@ -1118,21 +1058,6 @@
"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,
@@ -1163,6 +1088,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#fead66ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#cccac2ff",
"font_style": null,
@@ -1173,11 +1103,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#73cfffff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#cccac2ff",
"font_style": null,
assets/themes/gruvbox/gruvbox.json
+54 -204
View File
@@ -253,11 +253,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#b8bb25ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#8c957dff",
"font_style": null,
@@ -273,21 +268,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#8ec07cff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#d3869bff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#d3869bff",
"font_style": null,
@@ -333,8 +323,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#83a598ff",
"punctuation.list_marker": {
"color": "#ebdbb2ff",
"font_style": null,
"font_weight": null
},
@@ -343,21 +333,6 @@
"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,
@@ -388,6 +363,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#b8bb25ff",
"font_style": null,
@@ -398,11 +378,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#fabd2eff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#83a598ff",
"font_style": null,
@@ -666,11 +641,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#b8bb25ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#8c957dff",
"font_style": null,
@@ -686,21 +656,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#8ec07cff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#d3869bff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#d3869bff",
"font_style": null,
@@ -746,8 +711,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#83a598ff",
"punctuation.list_marker": {
"color": "#ebdbb2ff",
"font_style": null,
"font_weight": null
},
@@ -756,21 +721,6 @@
"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,
@@ -801,6 +751,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#b8bb25ff",
"font_style": null,
@@ -811,11 +766,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#fabd2eff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#83a598ff",
"font_style": null,
@@ -1079,11 +1029,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#b8bb25ff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#8c957dff",
"font_style": null,
@@ -1099,21 +1044,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#8ec07cff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#d3869bff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#d3869bff",
"font_style": null,
@@ -1159,8 +1099,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#83a598ff",
"punctuation.list_marker": {
"color": "#ebdbb2ff",
"font_style": null,
"font_weight": null
},
@@ -1169,21 +1109,6 @@
"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,
@@ -1214,6 +1139,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#83a598ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#b8bb25ff",
"font_style": null,
@@ -1224,11 +1154,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#fabd2eff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#83a598ff",
"font_style": null,
@@ -1492,11 +1417,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#79740eff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#677562ff",
"font_style": null,
@@ -1512,21 +1432,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#427b58ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#8f3e71ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#8f3e71ff",
"font_style": null,
@@ -1572,8 +1487,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#066578ff",
"punctuation.list_marker": {
"color": "#282828ff",
"font_style": null,
"font_weight": null
},
@@ -1582,21 +1497,6 @@
"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,
@@ -1627,6 +1527,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#79740eff",
"font_style": null,
@@ -1637,11 +1542,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#b57613ff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#066578ff",
"font_style": null,
@@ -1905,11 +1805,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#79740eff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#677562ff",
"font_style": null,
@@ -1925,21 +1820,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#427b58ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#8f3e71ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#8f3e71ff",
"font_style": null,
@@ -1985,8 +1875,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#066578ff",
"punctuation.list_marker": {
"color": "#282828ff",
"font_style": null,
"font_weight": null
},
@@ -1995,21 +1885,6 @@
"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,
@@ -2040,6 +1915,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#79740eff",
"font_style": null,
@@ -2050,11 +1930,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#b57613ff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#066578ff",
"font_style": null,
@@ -2318,11 +2193,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#79740eff",
"font_style": null,
"font_weight": 700
},
"hint": {
"color": "#677562ff",
"font_style": null,
@@ -2338,21 +2208,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#427b58ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#8f3e71ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#8f3e71ff",
"font_style": null,
@@ -2398,8 +2263,8 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"color": "#066578ff",
"punctuation.list_marker": {
"color": "#282828ff",
"font_style": null,
"font_weight": null
},
@@ -2408,21 +2273,6 @@
"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,
@@ -2453,6 +2303,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#066578ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#79740eff",
"font_style": null,
@@ -2463,11 +2318,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#b57613ff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#066578ff",
"font_style": null,
assets/themes/one/one.json
+16 -66
View File
@@ -239,11 +239,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#d07277ff",
"font_style": null,
"font_weight": 400
},
"hint": {
"color": "#788ca6ff",
"font_style": null,
@@ -259,21 +254,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#73ade9ff",
"font_style": "normal",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#6eb4bfff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#dce0e5ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#bf956aff",
"font_style": null,
@@ -319,7 +309,7 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"punctuation.list_marker": {
"color": "#d07277ff",
"font_style": null,
"font_weight": null
@@ -329,21 +319,6 @@
"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,
@@ -374,6 +349,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#a1c181ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#d07277ff",
"font_style": null,
@@ -384,11 +364,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#6eb4bfff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#dce0e5ff",
"font_style": null,
@@ -643,11 +618,6 @@
"font_style": null,
"font_weight": null
},
"heading": {
"color": "#d3604fff",
"font_style": null,
"font_weight": 400
},
"hint": {
"color": "#7274a7ff",
"font_style": null,
@@ -663,21 +633,16 @@
"font_style": null,
"font_weight": null
},
"link": {
"link_text": {
"color": "#5b79e3ff",
"font_style": "italic",
"font_weight": null
},
"link.url": {
"link_uri": {
"color": "#3882b7ff",
"font_style": null,
"font_weight": null
},
"namespace": {
"color": "#242529ff",
"font_style": null,
"font_weight": null
},
"number": {
"color": "#ad6e25ff",
"font_style": null,
@@ -723,7 +688,7 @@
"font_style": null,
"font_weight": null
},
"punctuation.markup": {
"punctuation.list_marker": {
"color": "#d3604fff",
"font_style": null,
"font_weight": null
@@ -733,21 +698,6 @@
"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,
@@ -778,6 +728,11 @@
"font_style": null,
"font_weight": null
},
"text.literal": {
"color": "#649f57ff",
"font_style": null,
"font_weight": null
},
"title": {
"color": "#d3604fff",
"font_style": null,
@@ -788,11 +743,6 @@
"font_style": null,
"font_weight": null
},
"unit": {
"color": "#3882b7ff",
"font_style": null,
"font_weight": null
},
"variable": {
"color": "#242529ff",
"font_style": null,