mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8027

Browse Source 
8027: Completion context remove exact match method in favor of fields r=JoshMcguigan a=JoshMcguigan

This is a minor cleanup PR following #8008. It removes the `expected_name_and_type` method on completion context in favor of using the fields. 

I thought this method was used in more places, or else it may have just made sense to make this change directly in #8008 🤷 

Co-authored-by: Josh Mcguigan <joshmcg88@gmail.com>
This commit is contained in:
bors[bot] 2021-03-15 13:42:12 +00:00 committed by GitHub
commit 3962b0d53c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ide_completion/src/render.rs
View File

@ -118,12 +118,6 @@ fn is_deprecated_assoc_item(&self, as_assoc_item: impl AsAssocItem) -> bool {
fn docs(&self, node: impl HasAttrs) -> Option<Documentation> {
node.docs(self.db())
}
// FIXME delete this method in favor of directly using the fields
// on CompletionContext
fn expected_name_and_type(&self) -> Option<(String, Type)> {
Some((self.completion.expected_name.clone()?, self.completion.expected_type.clone()?))
}
}
/// Generic renderer for completion items.
@ -249,8 +243,8 @@ fn render_resolution(
relevance.is_local = true;
item.set_relevance(relevance);
if let Some((_expected_name, expected_type)) = self.ctx.expected_name_and_type() {
if ty != expected_type {
if let Some(expected_type) = self.ctx.completion.expected_type.as_ref() {
if &ty != expected_type {
if let Some(ty_without_ref) = expected_type.remove_ref() {
if relevance_type_match(self.ctx.db().upcast(), &ty, &ty_without_ref) {
cov_mark::hit!(suggest_ref);
@ -322,10 +316,8 @@ fn is_deprecated(&self, resolution: &ScopeDef) -> bool {
fn compute_relevance(ctx: &RenderContext, ty: &Type, name: &str) -> CompletionRelevance {
let mut res = CompletionRelevance::default();
if let Some((expected_name, expected_type)) = ctx.expected_name_and_type() {
res.exact_type_match = ty == &expected_type;
res.exact_name_match = name == &expected_name;
}
res.exact_type_match = Some(ty) == ctx.completion.expected_type.as_ref();
res.exact_name_match = Some(name) == ctx.completion.expected_name.as_deref();
res
}