Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-completion/src/completions/item_list.rs')
| -rw-r--r-- | crates/ide-completion/src/completions/item_list.rs | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/crates/ide-completion/src/completions/item_list.rs b/crates/ide-completion/src/completions/item_list.rs index 8ced01da67..33130028db 100644 --- a/crates/ide-completion/src/completions/item_list.rs +++ b/crates/ide-completion/src/completions/item_list.rs @@ -2,34 +2,37 @@ use crate::{ completions::module_or_fn_macro, - context::{ExprCtx, ItemListKind, PathCompletionCtx, PathKind, Qualified}, + context::{ExprCtx, ItemListKind, PathCompletionCtx, Qualified}, CompletionContext, Completions, }; pub(crate) mod trait_impl; -pub(crate) fn complete_item_list( +pub(crate) fn complete_item_list_in_expr( acc: &mut Completions, ctx: &CompletionContext, path_ctx: &PathCompletionCtx, + expr_ctx: &ExprCtx, +) { + if !expr_ctx.in_block_expr { + return; + } + if !path_ctx.is_trivial_path() { + return; + } + add_keywords(acc, ctx, None); +} + +pub(crate) fn complete_item_list( + acc: &mut Completions, + ctx: &CompletionContext, + path_ctx @ PathCompletionCtx { qualified, .. }: &PathCompletionCtx, + kind: &ItemListKind, ) { let _p = profile::span("complete_item_list"); - let qualified = match path_ctx { - PathCompletionCtx { kind: PathKind::Item { kind }, qualified, .. } => { - if path_ctx.is_trivial_path() { - add_keywords(acc, ctx, Some(kind)); - } - qualified - } - PathCompletionCtx { - kind: PathKind::Expr { expr_ctx: ExprCtx { in_block_expr: true, .. } }, - .. - } if path_ctx.is_trivial_path() => { - add_keywords(acc, ctx, None); - return; - } - _ => return, - }; + if path_ctx.is_trivial_path() { + add_keywords(acc, ctx, Some(kind)); + } match qualified { Qualified::With { |