bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve method name suggestions

Browse source 
Attempts to improve method name suggestions when a matching method name
is not found. The approach taken is use the Levenshtein distance and
account for substrings having a high distance but can sometimes be very
close to the intended method (eg. empty vs is_empty).
This commit is contained in:
Oliver Downard 2022-03-14 21:07:19 +00:00
parent 15a242a432
commit e2dfa23eac
9 changed files with 104 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_typeck/src/check/method/probe.rs
View file

@ -24,7 +24,9 @@ use rustc_middle::ty::GenericParamDefKind;
use rustc_middle::ty::{self, ParamEnvAnd, ToPredicate, Ty, TyCtxt, TypeFoldable};
use rustc_session::lint;
use rustc_span::def_id::LocalDefId;
use rustc_span::lev_distance::{find_best_match_for_name, lev_distance};
use rustc_span::lev_distance::{
find_best_match_for_name_with_substrings, lev_distance_with_substrings,
};
use rustc_span::{symbol::Ident, Span, Symbol, DUMMY_SP};
use rustc_trait_selection::autoderef::{self, Autoderef};
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;
@ -1699,7 +1701,11 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
.iter()
.map(|cand| cand.name)
.collect::<Vec<Symbol>>();
find_best_match_for_name(&names, self.method_name.unwrap().name, None)
find_best_match_for_name_with_substrings(
&names,
self.method_name.unwrap().name,
None,
)
}
.unwrap();
Ok(applicable_close_candidates.into_iter().find(|method| method.name == best_name))
@ -1856,7 +1862,8 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
if x.kind.namespace() != Namespace::ValueNS {
return false;
}
match lev_distance(name.as_str(), x.name.as_str(), max_dist) {
match lev_distance_with_substrings(name.as_str(), x.name.as_str(), max_dist)
{
Some(d) => d > 0,
None => false,
}