Fix NFKC normalization bug when removing unused imports

astral-sh · Jul 29, 2024 · 8644e30 · 8644e30
1 parent 381bd1f
commit 8644e30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ruff_linter/Cargo.toml b/crates/ruff_linter/Cargo.toml
@@ -69,6 +69,7 @@ toml = { workspace = true }
 typed-arena = { workspace = true }
 unicode-width = { workspace = true }
 unicode_names2 = { workspace = true }
+unicode-normalization = { workspace = true }
 url = { workspace = true }
 
 [dev-dependencies]

diff --git a/crates/ruff_linter/src/fix/codemods.rs b/crates/ruff_linter/src/fix/codemods.rs
@@ -5,6 +5,7 @@ use libcst_native::{
     Codegen, CodegenState, Expression, ImportNames, NameOrAttribute, ParenthesizableWhitespace,
     SmallStatement, Statement,
 };
+use unicode_normalization::UnicodeNormalization;
 use ruff_python_ast::name::UnqualifiedName;
 use smallvec::{smallvec, SmallVec};
 
@@ -194,12 +195,13 @@ fn unqualified_name_from_expression<'a>(expr: &'a Expression<'a>) -> Option<Unqu
 }
 
 fn qualified_name_from_name_or_attribute(module: &NameOrAttribute) -> String {
-    match module {
+    let unnormalized = match module {
         NameOrAttribute::N(name) => name.value.to_string(),
         NameOrAttribute::A(attr) => {
             let name = attr.attr.value;
             let prefix = unqualified_name_from_expression(&attr.value);
             prefix.map_or_else(|| name.to_string(), |prefix| format!("{prefix}.{name}"))
         }
-    }
+    };
+    unnormalized.nfkc().collect()
 }