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

Merge pull request #694 from epage/fix

Browse source 
fix: Actuall ignore ignored identifiers
This commit is contained in:
Ed Page 2023-03-22 13:43:34 -05:00 committed by GitHub
commit 1aefbee825
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 176 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/typos-cli/src/dict.rs
View file

@ -249,7 +249,7 @@ impl<'i, 'w, D: typos::Dictionary> typos::Dictionary for Override<'i, 'w, D> {
fn correct_ident<'s, 't>(&'s self, ident: typos::tokens::Identifier<'t>) -> Option<Status<'s>> {
for ignored in &self.ignored_identifiers {
if ignored.is_match(ident.token()) {
return None;
return Some(Status::Valid);
}
}

1
crates/typos-cli/src/policy.rs
View file

@ -239,6 +239,7 @@ impl<'s> ConfigEngine<'s> {
let dict = crate::dict::BuiltIn::new(dict_config.locale());
let mut dict = crate::dict::Override::new(dict);
dict.ignored_identifiers(dict_config.extend_ignore_identifiers_re());
dict.identifiers(
dict_config
.extend_identifiers()

2
crates/typos-cli/tests/cmd/assumed-dir-failure.toml
View file

@ -1,2 +1,4 @@
bin.name = "typos"
status.code = 2
stdin = ""
stderr = ""

2
crates/typos-cli/tests/cmd/double-escaped.stdin
View file

@ -1,2 +0,0 @@
\n\n
Destory

2
crates/typos-cli/tests/cmd/double-escaped.stdout
View file

@ -1,2 +0,0 @@
\n\n
Destroy

9
crates/typos-cli/tests/cmd/double-escaped.toml
View file

@ -1,3 +1,12 @@
bin.name = "typos"
args = "--write-changes -"
status.code = 0
stdin = '''
\n\n
Destory
'''
stdout = """
/n/n
Destroy
"""
stderr = ""

12
crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.in/_typos.toml Normal file
View file

@ -0,0 +1,12 @@
[files]
extend-exclude = ["_typos.toml"]
[default.extend-identifiers]
hello = "goodbye"
[type.fail]
extend-glob = ["*.fail"]
[type.ignore]
extend-glob = ["*.ignore"]
extend-ignore-identifiers-re = ["he.*"]

1
crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.in/file.fail Normal file
View file

@ -0,0 +1 @@
hello

1
crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.in/file.ignore Normal file
View file

@ -0,0 +1 @@
hello

12
crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.toml Normal file
View file

@ -0,0 +1,12 @@
bin.name = "typos"
status.code = 2
stdin = ""
stdout = """
error: `hello` should be `goodbye`
--> ./file.fail:1:1
|
1 | hello
| ^^^^^
|
"""
stderr = ""

40
crates/typos-cli/tests/cmd/file-failure.toml
View file

@ -1,3 +1,43 @@
bin.name = "typos"
args = "../../README.md"
status.code = 2
stdin = ""
stdout = """
error: `Supress` should be `Suppress`
--> ../../README.md:78:19
|
78 | \"AttributeID.*Supress.*\",
| ^^^^^^^
|
error: `Supress` should be `Suppress`
--> ../../README.md:83:12
|
83 | AttributeIDSupressMenu = \"AttributeIDSupressMenu\"
| ^^^^^^^
|
error: `Supress` should be `Suppress`
--> ../../README.md:83:38
|
83 | AttributeIDSupressMenu = \"AttributeIDSupressMenu\"
| ^^^^^^^
|
error: `Teh` should be `The`
--> ../../README.md:86:30
|
86 | # Don't correct the surname \"Teh\"
| ^^^
|
error: `teh` should be `the`
--> ../../README.md:87:1
|
87 | teh = \"teh\"
| ^^^
|
error: `teh` should be `the`
--> ../../README.md:87:8
|
87 | teh = \"teh\"
| ^^^
|
"""
stderr = ""

2
crates/typos-cli/tests/cmd/relative-dir-failure.toml
View file

@ -1,3 +1,5 @@
bin.name = "typos"
args = "."
status.code = 2
stdin = ""
stderr = ""

1
crates/typos-cli/tests/cmd/stdin-correct.stdin
View file

@ -1 +0,0 @@
Apropriate world

1
crates/typos-cli/tests/cmd/stdin-correct.stdout
View file

@ -1 +0,0 @@
Appropriate world

7
crates/typos-cli/tests/cmd/stdin-correct.toml
View file

@ -1,2 +1,9 @@
bin.name = "typos"
args = "--write-changes -"
stdin = '''
Apropriate world
'''
stdout = """
Appropriate world
"""
stderr = ""

34
crates/typos-cli/tests/cmd/stdin-failure-multiwidth.stdin
View file

@ -1,34 +0,0 @@
---
Korean character (NFC)
Grapheme clusters: 1, codepoints: 1, UnicodeWidthStr::width() == 2
한 Apropriate world
^^^^^^^^^^ highlight here
---
Korean character (NFD).
Grapheme clusters: 1, codepoints: 3, UnicodeWidthStr::width() == 2
한 Apropriate world
^^^^^^^^^^ highlight here
---
Eye in Speech Bubble Emoji (U+1F441 U+FE0F U+200D U+1F5E8 U+FE0F, Recommended Emoji ZWJ Sequences, v2.0)
Grapheme clusters: 1, codepoints: 5, UnicodeWidthStr::width() == 2 (Read NOTE: https://github.com/unicode-rs/unicode-width)
👁️‍🗨️ Apropriate world
^^^^^^^^^^ highlight here
---
Face with spiral eyes (U+1F635 U+200D U+1F4AB, Recommended Emoji ZWJ Sequence, v13.1)
Grapheme clusters: 1, codepoints: 3, UnicodeWidthStr::width() == 4 (Read NOTE: https://github.com/unicode-rs/unicode-width)
😵‍💫 Apropriate world
^^^^^^^^^^ highlight here
---
Horizontal tab (\t, U+09)
Grapheme clusters: 1, codepoints: 1, UnicodeWidthStr::width() == 0
Apropriate world
^^^^^^^^^^ highlight here

30
crates/typos-cli/tests/cmd/stdin-failure-multiwidth.stdout
View file

@ -1,30 +0,0 @@
error: `Apropriate` should be `Appropriate`
--> -:5:3
|
5 | 한 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:12:3
|
12 | 한 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:19:3
|
19 | 👁️‍🗨️ Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:26:3
|
26 | 😵‍💫 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:33:2
|
33 | Apropriate world
| ^^^^^^^^^^
|

69
crates/typos-cli/tests/cmd/stdin-failure-multiwidth.toml
View file

@ -1,3 +1,72 @@
bin.name = "typos"
args = "-"
status.code = 2
stdin = '''
---
Korean character (NFC)
Grapheme clusters: 1, codepoints: 1, UnicodeWidthStr::width() == 2
한 Apropriate world
^^^^^^^^^^ highlight here
---
Korean character (NFD).
Grapheme clusters: 1, codepoints: 3, UnicodeWidthStr::width() == 2
한 Apropriate world
^^^^^^^^^^ highlight here
---
Eye in Speech Bubble Emoji (U+1F441 U+FE0F U+200D U+1F5E8 U+FE0F, Recommended Emoji ZWJ Sequences, v2.0)
Grapheme clusters: 1, codepoints: 5, UnicodeWidthStr::width() == 2 (Read NOTE: https://github.com/unicode-rs/unicode-width)
👁️‍🗨️ Apropriate world
^^^^^^^^^^ highlight here
---
Face with spiral eyes (U+1F635 U+200D U+1F4AB, Recommended Emoji ZWJ Sequence, v13.1)
Grapheme clusters: 1, codepoints: 3, UnicodeWidthStr::width() == 4 (Read NOTE: https://github.com/unicode-rs/unicode-width)
😵‍💫 Apropriate world
^^^^^^^^^^ highlight here
---
Horizontal tab (\t, U+09)
Grapheme clusters: 1, codepoints: 1, UnicodeWidthStr::width() == 0
Apropriate world
^^^^^^^^^^ highlight here
'''
stdout = """
error: `Apropriate` should be `Appropriate`
--> -:5:3
|
5 | 한 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:12:3
|
12 | 한 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:19:3
|
19 | 👁️‍🗨️ Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:26:3
|
26 | 😵‍💫 Apropriate world
| ^^^^^^^^^^
|
error: `Apropriate` should be `Appropriate`
--> -:33:2
|
33 | Apropriate world
| ^^^^^^^^^^
|
"""
stderr = ""

1
crates/typos-cli/tests/cmd/stdin-failure.stdin
View file

@ -1 +0,0 @@
Apropriate world

12
crates/typos-cli/tests/cmd/stdin-failure.toml
View file

@ -1,3 +1,15 @@
bin.name = "typos"
args = "-"
status.code = 2
stdin = '''
Apropriate world
'''
stdout = """
error: `Apropriate` should be `Appropriate`
--> -:1:1
|
1 | Apropriate world
| ^^^^^^^^^^
|
"""
stderr = ""

1
crates/typos-cli/tests/cmd/stdin-success.stdin
View file

@ -1 +0,0 @@
Hello world

5
crates/typos-cli/tests/cmd/stdin-success.toml
View file

@ -1,2 +1,7 @@
bin.name = "typos"
args = "-"
stdin = '''
Hello world
'''
stdout = ""
stderr = ""

2
docs/reference.md
View file

@ -31,4 +31,4 @@ Configuration is read from the following (in precedence order)
| default.extend-ignore-identifiers-re | \- | list of [regexes](https://docs.rs/regex/latest/regex/index.html#syntax) | Pattern-match always-valid identifiers |
| default.extend-words | \- | table of strings | Corrections for [words](./design.md#identifiers-and-words). When the correction is blank, the word is never valid. When the correction is the key, the word is always valid. |
| type.\<name>.\<field> | \<varied> | \<varied> | See `default.` for child keys. Run with `--type-list` to see available `<name>`s |
| type.\<name>.extend_globs | \- | list of strings | File globs for matching `<name>` |
| type.\<name>.extend-glob | \- | list of strings | File globs for matching `<name>` |