Rollup merge of #118381 - Enselic:edit-dist-len, r=WaffleLapkin

rustc_span: Use correct edit distance start length for suggestions

Otherwise the suggestions can be off-base for non-ASCII identifiers. For example suggesting that `Ok` is a name similar to `读文`.

Closes https://github.com/rust-lang/rust/issues/72553.
This commit is contained in:
Michael Goulet 2023-11-27 19:06:48 -05:00 committed by GitHub
commit 344459ed4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions

View File

@ -188,7 +188,11 @@ fn find_best_match_for_name_impl(
return Some(*c);
}
let mut dist = dist.unwrap_or_else(|| cmp::max(lookup.len(), 3) / 3);
// `fn edit_distance()` use `chars()` to calculate edit distance, so we must
// also use `chars()` (and not `str::len()`) to calculate length here.
let lookup_len = lookup.chars().count();
let mut dist = dist.unwrap_or_else(|| cmp::max(lookup_len, 3) / 3);
let mut best = None;
// store the candidates with the same distance, only for `use_substring_score` current.
let mut next_candidates = vec![];

View File

@ -0,0 +1,4 @@
fn main() {
// There shall be no suggestions here. In particular not `Ok`.
let _ = ; //~ ERROR cannot find value `读文` in this scope
}

View File

@ -0,0 +1,9 @@
error[E0425]: cannot find value `读文` in this scope
--> $DIR/non_ascii_ident.rs:3:13
|
LL | let _ = 读文;
| ^^^^ not found in this scope
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0425`.