mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-28 14:03:35 +00:00
add notable_trait predicate to CompletionRelevance
implement the predicate set on the case function from traits
This commit is contained in:
parent
af40101841
commit
df5c647982
5 changed files with 28 additions and 0 deletions
|
@ -207,6 +207,13 @@ impl Attrs {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn has_doc_notable_trait(&self) -> bool {
|
||||||
|
self.by_key("doc").tt_values().any(|tt| {
|
||||||
|
tt.delimiter.kind == DelimiterKind::Parenthesis &&
|
||||||
|
matches!(&*tt.token_trees, [tt::TokenTree::Leaf(tt::Leaf::Ident(ident))] if ident.text == "notable_trait")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub fn doc_exprs(&self) -> impl Iterator<Item = DocExpr> + '_ {
|
pub fn doc_exprs(&self) -> impl Iterator<Item = DocExpr> + '_ {
|
||||||
self.by_key("doc").tt_values().map(DocExpr::parse)
|
self.by_key("doc").tt_values().map(DocExpr::parse)
|
||||||
}
|
}
|
||||||
|
|
|
@ -529,6 +529,11 @@ impl CompletionContext<'_> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether the given trait has `#[doc(notable_trait)]`
|
||||||
|
pub(crate) fn is_doc_notable_trait(&self, trait_: hir::Trait) -> bool {
|
||||||
|
trait_.attrs(self.db).has_doc_notable_trait()
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns the traits in scope, with the [`Drop`] trait removed.
|
/// Returns the traits in scope, with the [`Drop`] trait removed.
|
||||||
pub(crate) fn traits_in_scope(&self) -> hir::VisibleTraits {
|
pub(crate) fn traits_in_scope(&self) -> hir::VisibleTraits {
|
||||||
let mut traits_in_scope = self.scope.visible_traits();
|
let mut traits_in_scope = self.scope.visible_traits();
|
||||||
|
|
|
@ -152,6 +152,8 @@ pub struct CompletionRelevance {
|
||||||
pub is_local: bool,
|
pub is_local: bool,
|
||||||
/// This is set when trait items are completed in an impl of that trait.
|
/// This is set when trait items are completed in an impl of that trait.
|
||||||
pub is_item_from_trait: bool,
|
pub is_item_from_trait: bool,
|
||||||
|
/// This is set for when trait items are from traits with `#[doc(notable_trait)]`
|
||||||
|
pub is_item_from_notable_trait: bool,
|
||||||
/// This is set when an import is suggested whose name is already imported.
|
/// This is set when an import is suggested whose name is already imported.
|
||||||
pub is_name_already_imported: bool,
|
pub is_name_already_imported: bool,
|
||||||
/// This is set for completions that will insert a `use` item.
|
/// This is set for completions that will insert a `use` item.
|
||||||
|
@ -228,6 +230,7 @@ impl CompletionRelevance {
|
||||||
is_private_editable,
|
is_private_editable,
|
||||||
postfix_match,
|
postfix_match,
|
||||||
is_definite,
|
is_definite,
|
||||||
|
is_item_from_notable_trait,
|
||||||
} = self;
|
} = self;
|
||||||
|
|
||||||
// lower rank private things
|
// lower rank private things
|
||||||
|
@ -266,6 +269,9 @@ impl CompletionRelevance {
|
||||||
if is_item_from_trait {
|
if is_item_from_trait {
|
||||||
score += 1;
|
score += 1;
|
||||||
}
|
}
|
||||||
|
if is_item_from_notable_trait {
|
||||||
|
score += 1;
|
||||||
|
}
|
||||||
if is_definite {
|
if is_definite {
|
||||||
score += 10;
|
score += 10;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1170,6 +1170,7 @@ fn main() { let _: m::Spam = S$0 }
|
||||||
),
|
),
|
||||||
is_local: false,
|
is_local: false,
|
||||||
is_item_from_trait: false,
|
is_item_from_trait: false,
|
||||||
|
is_item_from_notable_trait: false,
|
||||||
is_name_already_imported: false,
|
is_name_already_imported: false,
|
||||||
requires_import: false,
|
requires_import: false,
|
||||||
is_op_method: false,
|
is_op_method: false,
|
||||||
|
@ -1196,6 +1197,7 @@ fn main() { let _: m::Spam = S$0 }
|
||||||
),
|
),
|
||||||
is_local: false,
|
is_local: false,
|
||||||
is_item_from_trait: false,
|
is_item_from_trait: false,
|
||||||
|
is_item_from_notable_trait: false,
|
||||||
is_name_already_imported: false,
|
is_name_already_imported: false,
|
||||||
requires_import: false,
|
requires_import: false,
|
||||||
is_op_method: false,
|
is_op_method: false,
|
||||||
|
@ -1274,6 +1276,7 @@ fn foo() { A { the$0 } }
|
||||||
),
|
),
|
||||||
is_local: false,
|
is_local: false,
|
||||||
is_item_from_trait: false,
|
is_item_from_trait: false,
|
||||||
|
is_item_from_notable_trait: false,
|
||||||
is_name_already_imported: false,
|
is_name_already_imported: false,
|
||||||
requires_import: false,
|
requires_import: false,
|
||||||
is_op_method: false,
|
is_op_method: false,
|
||||||
|
@ -2089,6 +2092,7 @@ fn foo() {
|
||||||
),
|
),
|
||||||
is_local: false,
|
is_local: false,
|
||||||
is_item_from_trait: false,
|
is_item_from_trait: false,
|
||||||
|
is_item_from_notable_trait: false,
|
||||||
is_name_already_imported: false,
|
is_name_already_imported: false,
|
||||||
requires_import: false,
|
requires_import: false,
|
||||||
is_op_method: false,
|
is_op_method: false,
|
||||||
|
|
|
@ -79,6 +79,11 @@ fn render(
|
||||||
.and_then(|trait_| trait_.containing_trait_or_trait_impl(ctx.db()))
|
.and_then(|trait_| trait_.containing_trait_or_trait_impl(ctx.db()))
|
||||||
.map_or(false, |trait_| completion.is_ops_trait(trait_));
|
.map_or(false, |trait_| completion.is_ops_trait(trait_));
|
||||||
|
|
||||||
|
let is_item_from_notable_trait = func
|
||||||
|
.as_assoc_item(ctx.db())
|
||||||
|
.and_then(|trait_| trait_.containing_trait(ctx.db()))
|
||||||
|
.map_or(false, |trait_| completion.is_doc_notable_trait(trait_));
|
||||||
|
|
||||||
let (has_dot_receiver, has_call_parens, cap) = match func_kind {
|
let (has_dot_receiver, has_call_parens, cap) = match func_kind {
|
||||||
FuncKind::Function(&PathCompletionCtx {
|
FuncKind::Function(&PathCompletionCtx {
|
||||||
kind: PathKind::Expr { .. },
|
kind: PathKind::Expr { .. },
|
||||||
|
@ -105,6 +110,7 @@ fn render(
|
||||||
},
|
},
|
||||||
exact_name_match: compute_exact_name_match(completion, &call),
|
exact_name_match: compute_exact_name_match(completion, &call),
|
||||||
is_op_method,
|
is_op_method,
|
||||||
|
is_item_from_notable_trait,
|
||||||
..ctx.completion_relevance()
|
..ctx.completion_relevance()
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue