From a8a5b9524ddc9c52e519fea93b0ec6575ad43516 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 8 Dec 2023 11:07:52 -0500 Subject: [PATCH] Improve matching for punctuation tokens --- crates/theme2/src/themes/ayu.rs | 27 ++- crates/theme2/src/themes/gruvbox.rs | 168 +++++++++++++++ crates/theme2/src/themes/night_owl.rs | 56 +++++ crates/theme2/src/themes/noctis.rs | 231 +++++++++++++++++++++ crates/theme2/src/themes/nord.rs | 23 +- crates/theme2/src/themes/palenight.rs | 84 ++++++++ crates/theme2/src/themes/rose_pine.rs | 84 ++++++++ crates/theme2/src/themes/solarized.rs | 28 +++ crates/theme2/src/themes/synthwave_84.rs | 28 +++ crates/theme_importer/src/vscode/syntax.rs | 5 +- 10 files changed, 729 insertions(+), 5 deletions(-) diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index da8c08429758e91a1a0ce87d2a824d3854abae5d..84b8463758850806fd5e974e0a9a3ccec309f24e 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -190,7 +190,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x5c6166b3).into()), + color: Some(rgba(0x55b4d480).into()), ..Default::default() }, ), @@ -215,6 +215,13 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x55b4d480).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -465,7 +472,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0xcccac2b3).into()), + color: Some(rgba(0x5ccfe680).into()), ..Default::default() }, ), @@ -490,6 +497,13 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x5ccfe680).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -740,7 +754,7 @@ pub fn ayu() -> UserThemeFamily { ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0xbfbdb6b3).into()), + color: Some(rgba(0x39bae680).into()), ..Default::default() }, ), @@ -765,6 +779,13 @@ pub fn ayu() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x39bae680).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index f801d44032598dfcecf820a888b5ff276d94ae9a..9309f40503def77ba0ba1555fc1f1cc71bedffa7 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -155,6 +155,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -356,6 +384,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -557,6 +613,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x83a598ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -758,6 +842,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -959,6 +1071,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -1160,6 +1300,34 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x076678ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs index 2877d2c8a02558904d9eb818a5a9b21f3f29cd84..be33b928fef0a37bafb6a6e8caf1528eb8d0dfd1 100644 --- a/crates/theme2/src/themes/night_owl.rs +++ b/crates/theme2/src/themes/night_owl.rs @@ -152,6 +152,34 @@ pub fn night_owl() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x7fdbcaff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x7fdbcaff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x7fdbcaff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x7fdbcaff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -344,6 +372,34 @@ pub fn night_owl() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x994cc3ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x994cc3ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x994cc3ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x994cc3ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/noctis.rs b/crates/theme2/src/themes/noctis.rs index c37186816fe28b4077309957c12f80b13b0e9ffc..1e5688ddea60b013e0b6d996618caff94b8aa7e3 100644 --- a/crates/theme2/src/themes/noctis.rs +++ b/crates/theme2/src/themes/noctis.rs @@ -157,6 +157,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xbecfdaff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -164,6 +171,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xbecfdaff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xbecfdaff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -367,6 +388,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xcbbec2ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -374,6 +402,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xcbbec2ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xcbbec2ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -577,6 +619,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -584,6 +633,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -787,6 +850,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x0c006bff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -794,6 +864,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x0c006bff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x0c006bff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -997,6 +1081,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -1004,6 +1095,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x004d57ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -1207,6 +1312,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xc5cdd3ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -1214,6 +1326,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xc5cdd3ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xc5cdd3ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -1417,6 +1543,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -1424,6 +1557,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -1627,6 +1774,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -1634,6 +1788,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -1837,6 +2005,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -1844,6 +2019,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xb2cacdff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -2047,6 +2236,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xc5c2d6ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -2054,6 +2250,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xc5c2d6ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xc5c2d6ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -2257,6 +2467,13 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xccbfd9ff).into()), + ..Default::default() + }, + ), ( "punctuation.delimiter".into(), UserHighlightStyle { @@ -2264,6 +2481,20 @@ pub fn noctis() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xccbfd9ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xccbfd9ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs index a0f0c1fbf77a2e31cfe33eb3cb6e611ab2cea9fe..e15515295ca7129532f0ff336398adf5b3337949 100644 --- a/crates/theme2/src/themes/nord.rs +++ b/crates/theme2/src/themes/nord.rs @@ -138,7 +138,14 @@ pub fn nord() -> UserThemeFamily { ( "punctuation".into(), UserHighlightStyle { - color: Some(rgba(0x81a1c1ff).into()), + color: Some(rgba(0xeceff4ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0xeceff4ff).into()), ..Default::default() }, ), @@ -149,6 +156,20 @@ pub fn nord() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0xeceff4ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0xeceff4ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs index c825d229cb4cbce89a6ed6aaf68c2e9b0fbc7347..c97dea031713c8e0b61e23a2f34fb25506279ba4 100644 --- a/crates/theme2/src/themes/palenight.rs +++ b/crates/theme2/src/themes/palenight.rs @@ -180,6 +180,34 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -399,6 +427,34 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -618,6 +674,34 @@ pub fn palenight() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x89ddffff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 5296047562f23b2cc24daac563cb3e8899947498..65b4a21302db476007e7cea119430035c0668bb8 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -138,6 +138,34 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -315,6 +343,34 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x6e6a86ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { @@ -492,6 +548,34 @@ pub fn rose_pine() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x9893a5ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x9893a5ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x9893a5ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x9893a5ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 65aaa1e27e53ba1f2195a653bd48ae0e438fe6f5..532a5f846037469f0fa4bd4f05e9e98d26309995 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -159,6 +159,34 @@ pub fn solarized() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x657b83ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x657b83ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x657b83ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x657b83ff).into()), + ..Default::default() + }, + ), ( "string".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs index c0ffca1828bb28a824bfeda612a4bcab4ceb4b61..90e4ae213145aed5686a4f133efbdff3a8c981cd 100644 --- a/crates/theme2/src/themes/synthwave_84.rs +++ b/crates/theme2/src/themes/synthwave_84.rs @@ -148,6 +148,34 @@ pub fn synthwave_84() -> UserThemeFamily { ..Default::default() }, ), + ( + "punctuation.bracket".into(), + UserHighlightStyle { + color: Some(rgba(0x36f9f6ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.delimiter".into(), + UserHighlightStyle { + color: Some(rgba(0x36f9f6ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.list_marker".into(), + UserHighlightStyle { + color: Some(rgba(0x36f9f6ff).into()), + ..Default::default() + }, + ), + ( + "punctuation.special".into(), + UserHighlightStyle { + color: Some(rgba(0x36f9f6ff).into()), + ..Default::default() + }, + ), ( "tag".into(), UserHighlightStyle { diff --git a/crates/theme_importer/src/vscode/syntax.rs b/crates/theme_importer/src/vscode/syntax.rs index 1194548081e56d778a9a2fd8a2be148b8e67f1ce..e716d7c0e2f385c63972742746207b7e3e938c4c 100644 --- a/crates/theme_importer/src/vscode/syntax.rs +++ b/crates/theme_importer/src/vscode/syntax.rs @@ -168,6 +168,10 @@ impl ZedSyntaxToken { match self { ZedSyntaxToken::CommentDoc => &[ZedSyntaxToken::Comment], ZedSyntaxToken::VariableSpecial => &[ZedSyntaxToken::Variable], + ZedSyntaxToken::PunctuationBracket + | ZedSyntaxToken::PunctuationDelimiter + | ZedSyntaxToken::PunctuationListMarker + | ZedSyntaxToken::PunctuationSpecial => &[ZedSyntaxToken::Punctuation], _ => &[], } } @@ -224,7 +228,6 @@ impl ZedSyntaxToken { "punctuation.section", "punctuation.accessor", "punctuation.separator", - "punctuation.terminator", "punctuation.definition.tag", ], ZedSyntaxToken::PunctuationBracket => vec![