actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-12-22 23:52:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(parser): Allow backslashes after ignore items

Browse source 
To allow `\\` to start a token, we couldn't let it end a token.  By
switching the termiantor to a peek, we can now make it end a token
**and** start a token, allowing us to work better with windows paths.

Fixes #481
This commit is contained in:
Ed Page 2022-05-10 13:50:59 -05:00
parent 1720e7d65e
commit bd5048def5
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/typos/src/tokens.rs
View file

@ -183,15 +183,15 @@ mod parser {
// CAUTION: If adding an ignorable literal, if it doesn't start with `is_xid_continue`, // 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 `sep1` doesn't eat it all up
// - Make sure you always consume it // - Make sure you always consume it
terminated(uuid_literal, sep1), terminated(uuid_literal, peek(sep1)),
terminated(hash_literal, sep1), terminated(hash_literal, peek(sep1)),
terminated(base64_literal, sep1), // base64 should be quoted or something terminated(base64_literal, peek(sep1)), // base64 should be quoted or something
terminated(ordinal_literal, sep1), terminated(ordinal_literal, peek(sep1)),
terminated(hex_literal, sep1), terminated(hex_literal, peek(sep1)),
terminated(dec_literal, sep1), // Allow digit-prefixed words terminated(dec_literal, peek(sep1)), // Allow digit-prefixed words
terminated(email_literal, sep1), terminated(email_literal, peek(sep1)),
terminated(url_literal, sep1), terminated(url_literal, peek(sep1)),
terminated(css_color, sep1), terminated(css_color, peek(sep1)),
c_escape, c_escape,
printf, printf,
other, other,
@ -212,8 +212,12 @@ mod parser {
+ PartialEq + PartialEq
+ std::fmt::Debug, + std::fmt::Debug,
<T as nom::InputTakeAtPosition>::Item: AsChar + Copy, <T as nom::InputTakeAtPosition>::Item: AsChar + Copy,
<T as nom::InputIter>::Item: AsChar + Copy,
{ {
alt((take_while1(is_ignore_char), map(eof, |_| T::default())))(input) alt((
recognize(satisfy(|c| !is_xid_continue(c))),
map(eof, |_| T::default()),
))(input)
} }
fn other<T>(input: T) -> IResult<T, T> fn other<T>(input: T) -> IResult<T, T>
@ -1167,9 +1171,7 @@ mod test {
let input = " /// at /rustc/c7087fe00d2ba919df1d813c040a5d47e43b0fe7\\/src\\libstd\\rt.rs:51"; let input = " /// at /rustc/c7087fe00d2ba919df1d813c040a5d47e43b0fe7\\/src\\libstd\\rt.rs:51";
let expected: Vec<Identifier> = vec![ let expected: Vec<Identifier> = vec![
Identifier::new_unchecked("at", Case::None, 25), Identifier::new_unchecked("at", Case::None, 25),
Identifier::new_unchecked("rustc", Case::None, 29), // `rustc...` looks like the start of a URL
Identifier::new_unchecked("c7087fe00d2ba919df1d813c040a5d47e43b0fe7", Case::None, 35), // BUG: This shouldn't be here
Identifier::new_unchecked("src", Case::None, 77),
Identifier::new_unchecked("rs", Case::None, 91), Identifier::new_unchecked("rs", Case::None, 91),
]; ];
let actual: Vec<_> = parser.parse_bytes(input.as_bytes()).collect(); let actual: Vec<_> = parser.parse_bytes(input.as_bytes()).collect();