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

Improve matching for preprocessor tokens

Browse Source
This commit is contained in:
Marshall Bowers
2023-12-08 11:17:05 -05:00
parent 40a95221ea
commit 63ce7cd407
5 changed files with 145 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/theme2/src/themes/gruvbox.rs
+42
View File
@@ -141,6 +141,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xfe8019ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -391,6 +398,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xfe8019ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -641,6 +655,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xfe8019ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -891,6 +912,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xaf3a03ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1141,6 +1169,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xaf3a03ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1391,6 +1426,13 @@ pub fn gruvbox() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xaf3a03ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
crates/theme2/src/themes/noctis.rs
+77
View File
@@ -143,6 +143,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -395,6 +402,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -647,6 +661,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -899,6 +920,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1151,6 +1179,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xff5792ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1403,6 +1438,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xc88da2ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1655,6 +1697,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -1907,6 +1956,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -2159,6 +2215,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -2411,6 +2474,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -2663,6 +2733,13 @@ pub fn noctis() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xdf769bff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
crates/theme2/src/themes/nord.rs
+7
View File
@@ -135,6 +135,13 @@ pub fn nord() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0x5e81acff).into()),
..Default::default()
},
),
( (
"punctuation".into(), "punctuation".into(),
UserHighlightStyle { UserHighlightStyle {
crates/theme2/src/themes/solarized.rs
+14
View File
@@ -145,6 +145,13 @@ pub fn solarized() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
..Default::default()
},
),
( (
"property".into(), "property".into(),
UserHighlightStyle { UserHighlightStyle {
@@ -389,6 +396,13 @@ pub fn solarized() -> UserThemeFamily {
..Default::default() ..Default::default()
}, },
), ),
(
"preproc".into(),
UserHighlightStyle {
color: Some(rgba(0xb58900ff).into()),
..Default::default()
},
),
( (
"punctuation.bracket".into(), "punctuation.bracket".into(),
UserHighlightStyle { UserHighlightStyle {
crates/theme_importer/src/vscode/syntax.rs
+5 -1
View File
@@ -219,7 +219,11 @@ impl ZedSyntaxToken {
ZedSyntaxToken::Number => vec!["constant.numeric", "number"], ZedSyntaxToken::Number => vec!["constant.numeric", "number"],
ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"], ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],
ZedSyntaxToken::Predictive => vec![], ZedSyntaxToken::Predictive => vec![],
ZedSyntaxToken::Preproc => vec!["preproc"], ZedSyntaxToken::Preproc => vec![
"preproc",
"meta.preprocessor",
"punctuation.definition.preprocessor",
],
ZedSyntaxToken::Primary => vec![], ZedSyntaxToken::Primary => vec![],
ZedSyntaxToken::Property => vec![ ZedSyntaxToken::Property => vec![
"variable.member", "variable.member",