History

Improve matching for preprocessor tokens

Marshall Bowers committed 2 years ago

Commit 63ce7cd1 parent 40a95225 files · +145 −1Browse files

Unified · Split

5 files
  1. crates/theme2/src/themes/gruvbox.rs +42 −0
  2. crates/theme2/src/themes/noctis.rs +77 −0
  3. crates/theme2/src/themes/nord.rs +7 −0
  4. crates/theme2/src/themes/solarized.rs +14 −0
  5. crates/theme_importer/src/vscode/syntax.rs +5 −1
crates/theme2/src/themes/gruvbox.rs+42−0
@@ -141,6 +141,13 @@ pub fn gruvbox() -> UserThemeFamily { · 140 unmodified lines
141141 ..Default::default()
142142 },
143143 ),
144+ (
145+ "preproc".into(),
146+ UserHighlightStyle {
147+ color: Some(rgba(0xfe8019ff).into()),
148+ ..Default::default()
149+ },
150+ ),
144151 (
145152 "property".into(),
146153 UserHighlightStyle {
@@ -391,6 +398,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
391398 ..Default::default()
392399 },
393400 ),
401+ (
402+ "preproc".into(),
403+ UserHighlightStyle {
404+ color: Some(rgba(0xfe8019ff).into()),
405+ ..Default::default()
406+ },
407+ ),
394408 (
395409 "property".into(),
396410 UserHighlightStyle {
@@ -641,6 +655,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
641655 ..Default::default()
642656 },
643657 ),
658+ (
659+ "preproc".into(),
660+ UserHighlightStyle {
661+ color: Some(rgba(0xfe8019ff).into()),
662+ ..Default::default()
663+ },
664+ ),
644665 (
645666 "property".into(),
646667 UserHighlightStyle {
@@ -891,6 +912,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
891912 ..Default::default()
892913 },
893914 ),
915+ (
916+ "preproc".into(),
917+ UserHighlightStyle {
918+ color: Some(rgba(0xaf3a03ff).into()),
919+ ..Default::default()
920+ },
921+ ),
894922 (
895923 "property".into(),
896924 UserHighlightStyle {
@@ -1141,6 +1169,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
11411169 ..Default::default()
11421170 },
11431171 ),
1172+ (
1173+ "preproc".into(),
1174+ UserHighlightStyle {
1175+ color: Some(rgba(0xaf3a03ff).into()),
1176+ ..Default::default()
1177+ },
1178+ ),
11441179 (
11451180 "property".into(),
11461181 UserHighlightStyle {
@@ -1391,6 +1426,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
13911426 ..Default::default()
13921427 },
13931428 ),
1429+ (
1430+ "preproc".into(),
1431+ UserHighlightStyle {
1432+ color: Some(rgba(0xaf3a03ff).into()),
1433+ ..Default::default()
1434+ },
1435+ ),
13941436 (
13951437 "property".into(),
13961438 UserHighlightStyle {
crates/theme2/src/themes/noctis.rs+77−0
@@ -143,6 +143,13 @@ pub fn noctis() -> UserThemeFamily { · 142 unmodified lines
143143 ..Default::default()
144144 },
145145 ),
146+ (
147+ "preproc".into(),
148+ UserHighlightStyle {
149+ color: Some(rgba(0xdf769bff).into()),
150+ ..Default::default()
151+ },
152+ ),
146153 (
147154 "property".into(),
148155 UserHighlightStyle {
@@ -395,6 +402,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
395402 ..Default::default()
396403 },
397404 ),
405+ (
406+ "preproc".into(),
407+ UserHighlightStyle {
408+ color: Some(rgba(0xdf769bff).into()),
409+ ..Default::default()
410+ },
411+ ),
398412 (
399413 "property".into(),
400414 UserHighlightStyle {
@@ -647,6 +661,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
647661 ..Default::default()
648662 },
649663 ),
664+ (
665+ "preproc".into(),
666+ UserHighlightStyle {
667+ color: Some(rgba(0xff5792ff).into()),
668+ ..Default::default()
669+ },
670+ ),
650671 (
651672 "property".into(),
652673 UserHighlightStyle {
@@ -899,6 +920,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
899920 ..Default::default()
900921 },
901922 ),
923+ (
924+ "preproc".into(),
925+ UserHighlightStyle {
926+ color: Some(rgba(0xff5792ff).into()),
927+ ..Default::default()
928+ },
929+ ),
902930 (
903931 "property".into(),
904932 UserHighlightStyle {
@@ -1151,6 +1179,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
11511179 ..Default::default()
11521180 },
11531181 ),
1182+ (
1183+ "preproc".into(),
1184+ UserHighlightStyle {
1185+ color: Some(rgba(0xff5792ff).into()),
1186+ ..Default::default()
1187+ },
1188+ ),
11541189 (
11551190 "property".into(),
11561191 UserHighlightStyle {
@@ -1403,6 +1438,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
14031438 ..Default::default()
14041439 },
14051440 ),
1441+ (
1442+ "preproc".into(),
1443+ UserHighlightStyle {
1444+ color: Some(rgba(0xc88da2ff).into()),
1445+ ..Default::default()
1446+ },
1447+ ),
14061448 (
14071449 "property".into(),
14081450 UserHighlightStyle {
@@ -1655,6 +1697,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
16551697 ..Default::default()
16561698 },
16571699 ),
1700+ (
1701+ "preproc".into(),
1702+ UserHighlightStyle {
1703+ color: Some(rgba(0xdf769bff).into()),
1704+ ..Default::default()
1705+ },
1706+ ),
16581707 (
16591708 "property".into(),
16601709 UserHighlightStyle {
@@ -1907,6 +1956,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
19071956 ..Default::default()
19081957 },
19091958 ),
1959+ (
1960+ "preproc".into(),
1961+ UserHighlightStyle {
1962+ color: Some(rgba(0xdf769bff).into()),
1963+ ..Default::default()
1964+ },
1965+ ),
19101966 (
19111967 "property".into(),
19121968 UserHighlightStyle {
@@ -2159,6 +2215,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
21592215 ..Default::default()
21602216 },
21612217 ),
2218+ (
2219+ "preproc".into(),
2220+ UserHighlightStyle {
2221+ color: Some(rgba(0xdf769bff).into()),
2222+ ..Default::default()
2223+ },
2224+ ),
21622225 (
21632226 "property".into(),
21642227 UserHighlightStyle {
@@ -2411,6 +2474,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
24112474 ..Default::default()
24122475 },
24132476 ),
2477+ (
2478+ "preproc".into(),
2479+ UserHighlightStyle {
2480+ color: Some(rgba(0xdf769bff).into()),
2481+ ..Default::default()
2482+ },
2483+ ),
24142484 (
24152485 "property".into(),
24162486 UserHighlightStyle {
@@ -2663,6 +2733,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
26632733 ..Default::default()
26642734 },
26652735 ),
2736+ (
2737+ "preproc".into(),
2738+ UserHighlightStyle {
2739+ color: Some(rgba(0xdf769bff).into()),
2740+ ..Default::default()
2741+ },
2742+ ),
26662743 (
26672744 "property".into(),
26682745 UserHighlightStyle {
crates/theme2/src/themes/nord.rs+7−0
@@ -135,6 +135,13 @@ pub fn nord() -> UserThemeFamily { · 134 unmodified lines
135135 ..Default::default()
136136 },
137137 ),
138+ (
139+ "preproc".into(),
140+ UserHighlightStyle {
141+ color: Some(rgba(0x5e81acff).into()),
142+ ..Default::default()
143+ },
144+ ),
138145 (
139146 "punctuation".into(),
140147 UserHighlightStyle {
crates/theme2/src/themes/solarized.rs+14−0
@@ -145,6 +145,13 @@ pub fn solarized() -> UserThemeFamily { · 144 unmodified lines
145145 ..Default::default()
146146 },
147147 ),
148+ (
149+ "preproc".into(),
150+ UserHighlightStyle {
151+ color: Some(rgba(0xb58900ff).into()),
152+ ..Default::default()
153+ },
154+ ),
148155 (
149156 "property".into(),
150157 UserHighlightStyle {
@@ -389,6 +396,13 @@ pub fn solarized() -> UserThemeFamily { · 238 unmodified lines
389396 ..Default::default()
390397 },
391398 ),
399+ (
400+ "preproc".into(),
401+ UserHighlightStyle {
402+ color: Some(rgba(0xb58900ff).into()),
403+ ..Default::default()
404+ },
405+ ),
392406 (
393407 "punctuation.bracket".into(),
394408 UserHighlightStyle {
crates/theme_importer/src/vscode/syntax.rs+5−1
@@ -219,7 +219,11 @@ impl ZedSyntaxToken { · 218 unmodified lines
219219 ZedSyntaxToken::Number => vec!["constant.numeric", "number"],
220220 ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],
221221 ZedSyntaxToken::Predictive => vec![],
222− ZedSyntaxToken::Preproc => vec!["preproc"],
222+ ZedSyntaxToken::Preproc => vec![
223+ "preproc",
224+ "meta.preprocessor",
225+ "punctuation.definition.preprocessor",
226+ ],
223227 ZedSyntaxToken::Primary => vec![],
224228 ZedSyntaxToken::Property => vec![
225229 "variable.member",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t