From 6634a5e9f63522304bbb9378b5c9f2133a5e847b Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 8 Dec 2023 11:23:42 -0500 Subject: [PATCH] Improve matching for constant tokens further --- crates/theme2/src/themes/andromeda.rs | 14 ++++++++ crates/theme2/src/themes/dracula.rs | 7 ++++ crates/theme2/src/themes/gruvbox.rs | 42 ++++++++++++++++++++++ crates/theme_importer/src/vscode/syntax.rs | 2 +- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 766329b353ca343d44d9da48220486033a9bd9fe..38c859333fa49d6a1da1e9ffb250e4c601483f5b 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -88,6 +88,13 @@ pub fn andromeda() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xee5d43ff).into()), + ..Default::default() + }, + ), ( "emphasis".into(), UserHighlightStyle { @@ -278,6 +285,13 @@ pub fn andromeda() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xee5d43ff).into()), + ..Default::default() + }, + ), ( "emphasis".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs index 3953a245267a6f34d6be14f208f84f1e71cef393..ae6c9ad7888e6e1176785f61d5d1927eae4046e6 100644 --- a/crates/theme2/src/themes/dracula.rs +++ b/crates/theme2/src/themes/dracula.rs @@ -94,6 +94,13 @@ pub fn dracula() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xbd93f9ff).into()), + ..Default::default() + }, + ), ( "emphasis".into(), UserHighlightStyle { diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 5674593c2d84d355db17081dbbd22642dbc0e54a..32b580442a0dcb68b409f3f55cffd8153a10af4d 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -91,6 +91,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xd3869bff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { @@ -348,6 +355,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xd3869bff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { @@ -605,6 +619,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0xd3869bff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { @@ -862,6 +883,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0x8f3f71ff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { @@ -1119,6 +1147,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0x8f3f71ff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { @@ -1376,6 +1411,13 @@ pub fn gruvbox() -> UserThemeFamily { ..Default::default() }, ), + ( + "constant".into(), + UserHighlightStyle { + color: Some(rgba(0x8f3f71ff).into()), + ..Default::default() + }, + ), ( "emphasis.strong".into(), UserHighlightStyle { diff --git a/crates/theme_importer/src/vscode/syntax.rs b/crates/theme_importer/src/vscode/syntax.rs index 35f0f96a16b93bf8532de28191a913b1c6a9878f..e97839c9fe6db77d50ce57ae86fddfbec35be1de 100644 --- a/crates/theme_importer/src/vscode/syntax.rs +++ b/crates/theme_importer/src/vscode/syntax.rs @@ -186,7 +186,7 @@ impl ZedSyntaxToken { ZedSyntaxToken::Boolean => vec!["constant.language"], ZedSyntaxToken::Comment => vec!["comment"], ZedSyntaxToken::CommentDoc => vec!["comment.block.documentation"], - ZedSyntaxToken::Constant => vec!["constant.language", "constant.character"], + ZedSyntaxToken::Constant => vec!["constant", "constant.language", "constant.character"], ZedSyntaxToken::Constructor => { vec!["entity.name.function.definition.special.constructor"] }