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
141 ..Default::default()141 ..Default::default()
142 },142 },
143 ),143 ),
144 (
145 "preproc".into(),
146 UserHighlightStyle {
147 color: Some(rgba(0xfe8019ff).into()),
148 ..Default::default()
149 },
150 ),
144 (151 (
145 "property".into(),152 "property".into(),
146 UserHighlightStyle {153 UserHighlightStyle {
@@ -391,6 +398,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
391 ..Default::default()398 ..Default::default()
392 },399 },
393 ),400 ),
401 (
402 "preproc".into(),
403 UserHighlightStyle {
404 color: Some(rgba(0xfe8019ff).into()),
405 ..Default::default()
406 },
407 ),
394 (408 (
395 "property".into(),409 "property".into(),
396 UserHighlightStyle {410 UserHighlightStyle {
@@ -641,6 +655,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
641 ..Default::default()655 ..Default::default()
642 },656 },
643 ),657 ),
658 (
659 "preproc".into(),
660 UserHighlightStyle {
661 color: Some(rgba(0xfe8019ff).into()),
662 ..Default::default()
663 },
664 ),
644 (665 (
645 "property".into(),666 "property".into(),
646 UserHighlightStyle {667 UserHighlightStyle {
@@ -891,6 +912,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
891 ..Default::default()912 ..Default::default()
892 },913 },
893 ),914 ),
915 (
916 "preproc".into(),
917 UserHighlightStyle {
918 color: Some(rgba(0xaf3a03ff).into()),
919 ..Default::default()
920 },
921 ),
894 (922 (
895 "property".into(),923 "property".into(),
896 UserHighlightStyle {924 UserHighlightStyle {
@@ -1141,6 +1169,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
1141 ..Default::default()1169 ..Default::default()
1142 },1170 },
1143 ),1171 ),
1172 (
1173 "preproc".into(),
1174 UserHighlightStyle {
1175 color: Some(rgba(0xaf3a03ff).into()),
1176 ..Default::default()
1177 },
1178 ),
1144 (1179 (
1145 "property".into(),1180 "property".into(),
1146 UserHighlightStyle {1181 UserHighlightStyle {
@@ -1391,6 +1426,13 @@ pub fn gruvbox() -> UserThemeFamily { · 244 unmodified lines
1391 ..Default::default()1426 ..Default::default()
1392 },1427 },
1393 ),1428 ),
1429 (
1430 "preproc".into(),
1431 UserHighlightStyle {
1432 color: Some(rgba(0xaf3a03ff).into()),
1433 ..Default::default()
1434 },
1435 ),
1394 (1436 (
1395 "property".into(),1437 "property".into(),
1396 UserHighlightStyle {1438 UserHighlightStyle {
crates/theme2/src/themes/noctis.rs+77−0
@@ -143,6 +143,13 @@ pub fn noctis() -> UserThemeFamily { · 142 unmodified lines
143 ..Default::default()143 ..Default::default()
144 },144 },
145 ),145 ),
146 (
147 "preproc".into(),
148 UserHighlightStyle {
149 color: Some(rgba(0xdf769bff).into()),
150 ..Default::default()
151 },
152 ),
146 (153 (
147 "property".into(),154 "property".into(),
148 UserHighlightStyle {155 UserHighlightStyle {
@@ -395,6 +402,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
395 ..Default::default()402 ..Default::default()
396 },403 },
397 ),404 ),
405 (
406 "preproc".into(),
407 UserHighlightStyle {
408 color: Some(rgba(0xdf769bff).into()),
409 ..Default::default()
410 },
411 ),
398 (412 (
399 "property".into(),413 "property".into(),
400 UserHighlightStyle {414 UserHighlightStyle {
@@ -647,6 +661,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
647 ..Default::default()661 ..Default::default()
648 },662 },
649 ),663 ),
664 (
665 "preproc".into(),
666 UserHighlightStyle {
667 color: Some(rgba(0xff5792ff).into()),
668 ..Default::default()
669 },
670 ),
650 (671 (
651 "property".into(),672 "property".into(),
652 UserHighlightStyle {673 UserHighlightStyle {
@@ -899,6 +920,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
899 ..Default::default()920 ..Default::default()
900 },921 },
901 ),922 ),
923 (
924 "preproc".into(),
925 UserHighlightStyle {
926 color: Some(rgba(0xff5792ff).into()),
927 ..Default::default()
928 },
929 ),
902 (930 (
903 "property".into(),931 "property".into(),
904 UserHighlightStyle {932 UserHighlightStyle {
@@ -1151,6 +1179,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
1151 ..Default::default()1179 ..Default::default()
1152 },1180 },
1153 ),1181 ),
1182 (
1183 "preproc".into(),
1184 UserHighlightStyle {
1185 color: Some(rgba(0xff5792ff).into()),
1186 ..Default::default()
1187 },
1188 ),
1154 (1189 (
1155 "property".into(),1190 "property".into(),
1156 UserHighlightStyle {1191 UserHighlightStyle {
@@ -1403,6 +1438,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
1403 ..Default::default()1438 ..Default::default()
1404 },1439 },
1405 ),1440 ),
1441 (
1442 "preproc".into(),
1443 UserHighlightStyle {
1444 color: Some(rgba(0xc88da2ff).into()),
1445 ..Default::default()
1446 },
1447 ),
1406 (1448 (
1407 "property".into(),1449 "property".into(),
1408 UserHighlightStyle {1450 UserHighlightStyle {
@@ -1655,6 +1697,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
1655 ..Default::default()1697 ..Default::default()
1656 },1698 },
1657 ),1699 ),
1700 (
1701 "preproc".into(),
1702 UserHighlightStyle {
1703 color: Some(rgba(0xdf769bff).into()),
1704 ..Default::default()
1705 },
1706 ),
1658 (1707 (
1659 "property".into(),1708 "property".into(),
1660 UserHighlightStyle {1709 UserHighlightStyle {
@@ -1907,6 +1956,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
1907 ..Default::default()1956 ..Default::default()
1908 },1957 },
1909 ),1958 ),
1959 (
1960 "preproc".into(),
1961 UserHighlightStyle {
1962 color: Some(rgba(0xdf769bff).into()),
1963 ..Default::default()
1964 },
1965 ),
1910 (1966 (
1911 "property".into(),1967 "property".into(),
1912 UserHighlightStyle {1968 UserHighlightStyle {
@@ -2159,6 +2215,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
2159 ..Default::default()2215 ..Default::default()
2160 },2216 },
2161 ),2217 ),
2218 (
2219 "preproc".into(),
2220 UserHighlightStyle {
2221 color: Some(rgba(0xdf769bff).into()),
2222 ..Default::default()
2223 },
2224 ),
2162 (2225 (
2163 "property".into(),2226 "property".into(),
2164 UserHighlightStyle {2227 UserHighlightStyle {
@@ -2411,6 +2474,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
2411 ..Default::default()2474 ..Default::default()
2412 },2475 },
2413 ),2476 ),
2477 (
2478 "preproc".into(),
2479 UserHighlightStyle {
2480 color: Some(rgba(0xdf769bff).into()),
2481 ..Default::default()
2482 },
2483 ),
2414 (2484 (
2415 "property".into(),2485 "property".into(),
2416 UserHighlightStyle {2486 UserHighlightStyle {
@@ -2663,6 +2733,13 @@ pub fn noctis() -> UserThemeFamily { · 246 unmodified lines
2663 ..Default::default()2733 ..Default::default()
2664 },2734 },
2665 ),2735 ),
2736 (
2737 "preproc".into(),
2738 UserHighlightStyle {
2739 color: Some(rgba(0xdf769bff).into()),
2740 ..Default::default()
2741 },
2742 ),
2666 (2743 (
2667 "property".into(),2744 "property".into(),
2668 UserHighlightStyle {2745 UserHighlightStyle {
crates/theme2/src/themes/nord.rs+7−0
@@ -135,6 +135,13 @@ pub fn nord() -> UserThemeFamily { · 134 unmodified lines
135 ..Default::default()135 ..Default::default()
136 },136 },
137 ),137 ),
138 (
139 "preproc".into(),
140 UserHighlightStyle {
141 color: Some(rgba(0x5e81acff).into()),
142 ..Default::default()
143 },
144 ),
138 (145 (
139 "punctuation".into(),146 "punctuation".into(),
140 UserHighlightStyle {147 UserHighlightStyle {
crates/theme2/src/themes/solarized.rs+14−0
@@ -145,6 +145,13 @@ pub fn solarized() -> UserThemeFamily { · 144 unmodified lines
145 ..Default::default()145 ..Default::default()
146 },146 },
147 ),147 ),
148 (
149 "preproc".into(),
150 UserHighlightStyle {
151 color: Some(rgba(0xb58900ff).into()),
152 ..Default::default()
153 },
154 ),
148 (155 (
149 "property".into(),156 "property".into(),
150 UserHighlightStyle {157 UserHighlightStyle {
@@ -389,6 +396,13 @@ pub fn solarized() -> UserThemeFamily { · 238 unmodified lines
389 ..Default::default()396 ..Default::default()
390 },397 },
391 ),398 ),
399 (
400 "preproc".into(),
401 UserHighlightStyle {
402 color: Some(rgba(0xb58900ff).into()),
403 ..Default::default()
404 },
405 ),
392 (406 (
393 "punctuation.bracket".into(),407 "punctuation.bracket".into(),
394 UserHighlightStyle {408 UserHighlightStyle {
crates/theme_importer/src/vscode/syntax.rs+5−1
@@ -219,7 +219,11 @@ impl ZedSyntaxToken { · 218 unmodified lines
219 ZedSyntaxToken::Number => vec!["constant.numeric", "number"],219 ZedSyntaxToken::Number => vec!["constant.numeric", "number"],
220 ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],220 ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],
221 ZedSyntaxToken::Predictive => vec![],221 ZedSyntaxToken::Predictive => vec![],
222 ZedSyntaxToken::Preproc => vec!["preproc"],222 ZedSyntaxToken::Preproc => vec![
223 "preproc",
224 "meta.preprocessor",
225 "punctuation.definition.preprocessor",
226 ],
223 ZedSyntaxToken::Primary => vec![],227 ZedSyntaxToken::Primary => vec![],
224 ZedSyntaxToken::Property => vec![228 ZedSyntaxToken::Property => vec![
225 "variable.member",229 "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