Merge pull request #912 from epage/ts

fix(config): Don't treat ts as typoscript
crate-ci · Jan 19, 2024 · 3091467 · 3091467
2 parents 41f6ea9 + fe1a73c
commit 3091467
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/crates/typos-cli/src/default_types.rs b/crates/typos-cli/src/default_types.rs
@@ -39,7 +39,6 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
         "*.p7b",
         "*.p7c",
         "*.p7s",
-        "*.pem",
         // Keystore Files:
         "*.key",
         "*.keystore",
@@ -61,7 +60,6 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ]),
     ("creole", &["*.creole"]),
     ("crystal", &["Projectfile", "*.cr", "*.ecr", "shard.yml"]),
-    ("cs", &["*.cs"]),
     ("csharp", &["*.cs"]),
     ("cshtml", &["*.cshtml"]),
     ("css", &["*.css", "*.scss"]),
@@ -99,7 +97,6 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("gzip", &["*.gz", "*.tgz"]),
     ("h", &["*.h", "*.hpp"]),
     ("haml", &["*.haml"]),
-    ("haskell", &["*.hs", "*.lhs", "*.cpphs", "*.c2hs", "*.hsc"]),
     ("hbs", &["*.hbs"]),
     ("hs", &["*.hs", "*.lhs"]),
     ("html", &["*.htm", "*.html", "*.ejs"]),
@@ -159,7 +156,6 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ]),
     ("mako", &["*.mako", "*.mao"]),
     ("man", &["*.[0-9lnpx]", "*.[0-9][cEFMmpSx]"]),
-    ("markdown", &["*.markdown", "*.md", "*.mdown", "*.mkdn"]),
     ("matlab", &["*.m"]),
     ("md", &["*.markdown", "*.md", "*.mdown", "*.mkdn"]),
     ("meson", &["meson.build", "meson_options.txt"]),
@@ -265,15 +261,12 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("ts", &["*.ts", "*.tsx"]),
     ("twig", &["*.twig"]),
     ("txt", &["*.txt"]),
-    ("typoscript", &["*.typoscript", "*.ts"]),
+    ("typoscript", &["*.typoscript"]),
     ("vala", &["*.vala"]),
     ("vb", &["*.vb"]),
     ("vcl", &["*.vcl"]),
     ("verilog", &["*.v", "*.vh", "*.sv", "*.svh"]),
     ("vhdl", &["*.vhd", "*.vhdl"]),
-    ("vim", &[
-        "*.vim", ".vimrc", ".gvimrc", "vimrc", "gvimrc", "_vimrc", "_gvimrc",
-    ]),
     ("vimscript", &[
         "*.vim", ".vimrc", ".gvimrc", "vimrc", "gvimrc", "_vimrc", "_gvimrc",
     ]),
@@ -299,3 +292,20 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ]),
     ("zstd", &["*.zst", "*.zstd"]),
 ];
+
+// See `cargo test --lib -- --nocapture default_types::check_duplicates`
+#[test]
+fn check_duplicates() {
+    let mut reverse = std::collections::BTreeMap::new();
+    for (name, exts) in DEFAULT_TYPES {
+        for ext in *exts {
+            reverse.entry(ext).or_insert(Vec::new()).push(name);
+        }
+    }
+
+    for (ext, names) in reverse {
+        if 1 < names.len() {
+            println!("{ext} is under multiple names: {names:?}");
+        }
+    }
+}
diff --git a/crates/typos-cli/src/file_type_specifics.rs b/crates/typos-cli/src/file_type_specifics.rs
@@ -67,15 +67,6 @@ pub const TYPE_SPECIFIC_DICTS: &[(&str, StaticDictConfig)] = &[
             ignore_words: &[],
         },
     ),
-    (
-        "vim",
-        StaticDictConfig {
-            ignore_idents: &[
-                "windo", // https://vimdoc.sourceforge.net/htmldoc/windows.html#:windo
-            ],
-            ignore_words: &[],
-        },
-    ),
     (
         "vimscript",
         StaticDictConfig {