Merge pull request #694 from epage/fix

fix: Actuall ignore ignored identifiers

crates/typos-cli/src/dict.rs

@@ -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);
             }
         }
 

crates/typos-cli/src/policy.rs

@@ -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()

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

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

crates/typos-cli/tests/cmd/double-escaped.stdin

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

crates/typos-cli/tests/cmd/double-escaped.stdout

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

crates/typos-cli/tests/cmd/double-escaped.toml

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

crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.in/_typos.toml

@@ -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.*"]

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

@@ -0,0 +1 @@
+hello

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

@@ -0,0 +1 @@
+hello

crates/typos-cli/tests/cmd/extend-ignore-identifiers-re.toml

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

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

@@ -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 = ""

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

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

crates/typos-cli/tests/cmd/stdin-correct.stdin

@@ -1 +0,0 @@
-Apropriate world

crates/typos-cli/tests/cmd/stdin-correct.stdout

@@ -1 +0,0 @@
-Appropriate world

crates/typos-cli/tests/cmd/stdin-correct.toml

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

crates/typos-cli/tests/cmd/stdin-failure-multiwidth.stdin

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

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

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

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

@@ -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 = ""

crates/typos-cli/tests/cmd/stdin-failure.stdin

@@ -1 +0,0 @@
-Apropriate world

crates/typos-cli/tests/cmd/stdin-failure.toml

@@ -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 = ""

crates/typos-cli/tests/cmd/stdin-success.stdin

@@ -1 +0,0 @@
-Hello world

crates/typos-cli/tests/cmd/stdin-success.toml

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

docs/reference.md

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