Skip to content

Commit f41c983

Browse files
VeykrilVeykril
committed
Don't complete non-macro item paths in impls and modules
1 parent 30948e1 commit f41c983

File tree

6 files changed

+76
-29
lines changed

6 files changed

+76
-29
lines changed

‎crates/ide_completion/src/completions/flyimport.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ pub(crate) fn import_on_the_fly(acc: &mut Completions, ctx: &CompletionContext)
110110
if !ctx.config.enable_imports_on_the_fly {
111111
return None;
112112
}
113-
if ctx.use_item_syntax.is_some() || ctx.is_path_disallowed() {
113+
if ctx.use_item_syntax.is_some()
114+
|| ctx.is_path_disallowed()
115+
|| ctx.expects_item()
116+
|| ctx.expects_assoc_item()
117+
{
114118
return None;
115119
}
116120
let potential_import_name = {

‎crates/ide_completion/src/completions/keyword.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,35 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
4949
return;
5050
}
5151

52-
let has_trait_or_impl_parent = ctx.has_impl_or_trait_parent();
52+
let expects_assoc_item = ctx.expects_assoc_item();
5353
let has_block_expr_parent = ctx.has_block_expr_parent();
54-
let has_item_list_parent = ctx.has_item_list_parent();
54+
let expects_item = ctx.expects_item();
5555
if ctx.has_impl_or_trait_prev_sibling() {
5656
add_keyword(ctx, acc, "where", "where ");
5757
return;
5858
}
5959
if ctx.previous_token_is(T![unsafe]) {
60-
if has_item_list_parent || has_block_expr_parent {
60+
if expects_item || has_block_expr_parent {
6161
add_keyword(ctx, acc, "fn", "fn $1($2) {\n $0\n}")
6262
}
6363

64-
if has_item_list_parent || has_block_expr_parent {
64+
if expects_item || has_block_expr_parent {
6565
add_keyword(ctx, acc, "trait", "trait $1 {\n $0\n}");
6666
add_keyword(ctx, acc, "impl", "impl $1 {\n $0\n}");
6767
}
6868

6969
return;
7070
}
71-
if has_item_list_parent || has_trait_or_impl_parent || has_block_expr_parent {
71+
if expects_item || expects_assoc_item || has_block_expr_parent {
7272
add_keyword(ctx, acc, "fn", "fn $1($2) {\n $0\n}");
7373
}
74-
if has_item_list_parent || has_block_expr_parent {
74+
if expects_item || has_block_expr_parent {
7575
add_keyword(ctx, acc, "use", "use ");
7676
add_keyword(ctx, acc, "impl", "impl $1 {\n $0\n}");
7777
add_keyword(ctx, acc, "trait", "trait $1 {\n $0\n}");
7878
}
7979

80-
if has_item_list_parent {
80+
if expects_item {
8181
add_keyword(ctx, acc, "enum", "enum $1 {\n $0\n}");
8282
add_keyword(ctx, acc, "struct", "struct $0");
8383
add_keyword(ctx, acc, "union", "union $1 {\n $0\n}");
@@ -101,24 +101,23 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
101101
add_keyword(ctx, acc, "else", "else {\n $0\n}");
102102
add_keyword(ctx, acc, "else if", "else if $1 {\n $0\n}");
103103
}
104-
if has_item_list_parent || has_block_expr_parent {
104+
if expects_item || has_block_expr_parent {
105105
add_keyword(ctx, acc, "mod", "mod $0");
106106
}
107107
if ctx.has_ident_or_ref_pat_parent() {
108108
add_keyword(ctx, acc, "mut", "mut ");
109109
}
110-
if has_item_list_parent || has_trait_or_impl_parent || has_block_expr_parent {
110+
if expects_item || expects_assoc_item || has_block_expr_parent {
111111
add_keyword(ctx, acc, "const", "const ");
112112
add_keyword(ctx, acc, "type", "type ");
113113
}
114-
if has_item_list_parent || has_block_expr_parent {
114+
if expects_item || has_block_expr_parent {
115115
add_keyword(ctx, acc, "static", "static ");
116116
};
117-
if has_item_list_parent || has_block_expr_parent {
117+
if expects_item || has_block_expr_parent {
118118
add_keyword(ctx, acc, "extern", "extern ");
119119
}
120-
if has_item_list_parent || has_trait_or_impl_parent || has_block_expr_parent || ctx.is_match_arm
121-
{
120+
if expects_item || expects_assoc_item || has_block_expr_parent || ctx.is_match_arm {
122121
add_keyword(ctx, acc, "unsafe", "unsafe ");
123122
}
124123
if ctx.in_loop_body {
@@ -130,7 +129,7 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
130129
add_keyword(ctx, acc, "break", "break");
131130
}
132131
}
133-
if has_item_list_parent || ctx.has_impl_parent() || ctx.has_field_list_parent() {
132+
if expects_item || ctx.expects_non_trait_assoc_item() || ctx.expect_record_field() {
134133
add_keyword(ctx, acc, "pub(crate)", "pub(crate) ");
135134
add_keyword(ctx, acc, "pub", "pub ");
136135
}

‎crates/ide_completion/src/completions/qualified_path.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
2121
};
2222
let context_module = ctx.scope.module();
2323

24+
if ctx.expects_item() || ctx.expects_assoc_item() {
25+
if let PathResolution::Def(hir::ModuleDef::Module(module)) = resolution {
26+
let module_scope = module.scope(ctx.db, context_module);
27+
for (name, def) in module_scope {
28+
if let ScopeDef::MacroDef(macro_def) = def {
29+
acc.add_macro(ctx, Some(name.to_string()), macro_def);
30+
}
31+
}
32+
}
33+
return;
34+
}
35+
2436
// Add associated types on type parameters and `Self`.
2537
resolution.assoc_type_shorthand_candidates(ctx.db, |_, alias| {
2638
acc.add_type_alias(ctx, alias);

‎crates/ide_completion/src/completions/unqualified_path.rs

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
1212
if ctx.is_path_disallowed() {
1313
return;
1414
}
15+
if ctx.expects_item() || ctx.expects_assoc_item() {
16+
ctx.scope.process_all_names(&mut |name, def| {
17+
if let ScopeDef::MacroDef(macro_def) = def {
18+
acc.add_macro(ctx, Some(name.to_string()), macro_def);
19+
}
20+
});
21+
return;
22+
}
1523

1624
if let Some(hir::Adt::Enum(e)) =
1725
ctx.expected_type.as_ref().and_then(|ty| ty.strip_references().as_adt())
@@ -647,7 +655,7 @@ fn f() {}
647655
}
648656

649657
#[test]
650-
fn completes_type_or_trait_in_impl_block() {
658+
fn completes_target_type_or_trait_in_impl_block() {
651659
check(
652660
r#"
653661
trait MyTrait {}
@@ -662,4 +670,21 @@ impl My$0
662670
"#]],
663671
)
664672
}
673+
674+
#[test]
675+
fn only_completes_macros_in_assoc_item_list() {
676+
check(
677+
r#"
678+
struct MyStruct {}
679+
macro_rules! foo {}
680+
681+
impl MyStruct {
682+
$0
683+
}
684+
"#,
685+
expect![[r#"
686+
ma foo! macro_rules! foo
687+
"#]],
688+
)
689+
}
665690
}

‎crates/ide_completion/src/context.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ pub(crate) struct CompletionContext<'a> {
127127

128128
no_completion_required: bool,
129129
}
130+
130131
impl<'a> CompletionContext<'a> {
131132
pub(super) fn new(
132133
db: &'a RootDatabase,
@@ -281,33 +282,33 @@ impl<'a> CompletionContext<'a> {
281282
self.previous_token.as_ref().map_or(false, |tok| tok.kind() == kind)
282283
}
283284

284-
pub(crate) fn has_impl_or_trait_parent(&self) -> bool {
285+
pub(crate) fn expects_assoc_item(&self) -> bool {
285286
matches!(
286287
self.completion_location,
287288
Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl)
288289
)
289290
}
290291

291-
pub(crate) fn has_block_expr_parent(&self) -> bool {
292-
matches!(self.completion_location, Some(ImmediateLocation::BlockExpr))
292+
pub(crate) fn expects_non_trait_assoc_item(&self) -> bool {
293+
matches!(self.completion_location, Some(ImmediateLocation::Impl))
293294
}
294295

295-
pub(crate) fn has_item_list_parent(&self) -> bool {
296+
pub(crate) fn expects_item(&self) -> bool {
296297
matches!(self.completion_location, Some(ImmediateLocation::ItemList))
297298
}
298299

300+
pub(crate) fn has_block_expr_parent(&self) -> bool {
301+
matches!(self.completion_location, Some(ImmediateLocation::BlockExpr))
302+
}
303+
299304
pub(crate) fn has_ident_or_ref_pat_parent(&self) -> bool {
300305
matches!(
301306
self.completion_location,
302307
Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefPatOrExpr)
303308
)
304309
}
305310

306-
pub(crate) fn has_impl_parent(&self) -> bool {
307-
matches!(self.completion_location, Some(ImmediateLocation::Impl))
308-
}
309-
310-
pub(crate) fn has_field_list_parent(&self) -> bool {
311+
pub(crate) fn expect_record_field(&self) -> bool {
311312
matches!(self.completion_location, Some(ImmediateLocation::RecordFieldList))
312313
}
313314

@@ -320,10 +321,10 @@ impl<'a> CompletionContext<'a> {
320321
|| self.record_pat_syntax.is_some()
321322
|| self.attribute_under_caret.is_some()
322323
|| self.mod_declaration_under_caret.is_some()
323-
|| self.has_impl_or_trait_parent()
324324
}
325325

326326
fn fill_keyword_patterns(&mut self, file_with_fake_ident: &SyntaxNode, offset: TextSize) {
327+
dbg!(file_with_fake_ident);
327328
let fake_ident_token = file_with_fake_ident.token_at_offset(offset).right_biased().unwrap();
328329
let syntax_element = NodeOrToken::Token(fake_ident_token);
329330
self.previous_token = previous_token(syntax_element.clone());

‎crates/ide_completion/src/patterns.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,15 @@ fn test_has_ref_parent() {
9292
}
9393

9494
pub(crate) fn has_item_list_or_source_file_parent(element: SyntaxElement) -> bool {
95-
match not_same_range_ancestor(element) {
96-
Some(it) => it.kind() == SOURCE_FILE || it.kind() == ITEM_LIST,
97-
None => true,
95+
let it = element
96+
.ancestors()
97+
.take_while(|it| it.text_range() == element.text_range())
98+
.last()
99+
.map(|it| (it.kind(), it.parent()));
100+
match it {
101+
Some((_, Some(it))) => it.kind() == SOURCE_FILE || it.kind() == ITEM_LIST,
102+
Some((MACRO_ITEMS, None) | (SOURCE_FILE, None)) => true,
103+
_ => false,
98104
}
99105
}
100106
#[test]

0 commit comments

Comments
 (0)