Improve matching for punctuation tokens

This commit is contained in:
Marshall Bowers 2023-12-08 11:07:52 -05:00
parent 53d77b192a
commit a8a5b9524d
10 changed files with 729 additions and 5 deletions

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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![