Skip to content

perf(token): Reduce splitting overhead by about 10% #1284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 2 commits into from
Apr 23, 2025
Merged

perf(token): Reduce splitting overhead by about 10% #1284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c48981
docs(token): Fix a bad comment
epage Apr 23, 2025
400cd2f
perf(token): Reduce splitting overhead by about 10%
epage Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions crates/typos/src/tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,20 +185,20 @@ mod parser {
"ignore",
take_many0(alt((
// CAUTION: If adding an ignorable literal, if it doesn't start with `is_xid_continue`,
// - Update `is_ignore_char` to make sure `sep1` doesn't eat it all up
// - Update `is_ignore_char` to make sure `other` doesn't eat it all up
// - Make sure you always consume it
terminated(uuid_literal, peek(sep1)),
terminated(email_literal, peek(sep1)),
terminated(url_literal, peek(sep1)),
terminated(jwt, peek(sep1)),
terminated(base64_literal, peek(sep1)), // base64 should be quoted or something
terminated(hash_literal, peek(sep1)),
terminated(ordinal_literal, peek(sep1)),
terminated(hex_literal, peek(sep1)),
terminated(dec_literal, peek(sep1)), // Allow digit-prefixed words
terminated(css_color, peek(sep1)),
c_escape,
printf,
terminated(uuid_literal, sep1),
terminated(email_literal, sep1),
terminated(url_literal, sep1),
terminated(jwt, sep1),
terminated(base64_literal, sep1), // base64 should be quoted or something
terminated(hash_literal, sep1),
terminated(ordinal_literal, sep1),
terminated(hex_literal, sep1),
terminated(dec_literal, sep1), // Allow digit-prefixed words
terminated(css_color, sep1),
terminated(c_escape, sep1),
terminated(printf, sep1),
other,
))),
)
Expand All @@ -212,7 +212,8 @@ mod parser {
<T as Stream>::Token: AsChar + Copy,
{
alt((
one_of(|c| !is_xid_continue(c)).take(),
take_while(1.., is_ignore_char),
peek(one_of(|c| !is_xid_continue(c))).take(),
eof.map(|_| <T as Stream>::Slice::default()),
))
.parse_next(input)
Expand Down Expand Up @@ -647,11 +648,11 @@ mod parser {
fn is_ignore_char(i: impl AsChar + Copy) -> bool {
let c = i.as_char();
!unicode_xid::UnicodeXID::is_xid_continue(c) &&
// See c_escape
// See `c_escape`
c != '\\' &&
// See printf
// See `printf`
c != '%' &&
// See css_color
// See `css_color`
c != '#'
}

Expand Down Expand Up @@ -1439,6 +1440,11 @@ mod test {
case: None,
offset: 25,
},
Identifier {
token: "src",
case: None,
offset: 77,
},
Identifier {
token: "rs",
case: None,
Expand All @@ -1458,6 +1464,11 @@ mod test {
case: None,
offset: 25,
},
Identifier {
token: "src",
case: None,
offset: 77,
},
Identifier {
token: "rs",
case: None,
Expand Down
Loading