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

fix: Fix completions not considering ancestor items for attribute search

Browse Source
This commit is contained in:
Lukas Wirth 2022-01-05 21:12:36 +01:00
parent 68bc12c3b8
commit bd91327079
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
crates/ide_completion/src/context.rs
View File

@ -1,5 +1,7 @@
//! See `CompletionContext` structure. //! See `CompletionContext` structure.
use std::iter;
use base_db::SourceDatabaseExt; use base_db::SourceDatabaseExt;
use hir::{Local, Name, ScopeDef, Semantics, SemanticsScope, Type, TypeInfo}; use hir::{Local, Name, ScopeDef, Semantics, SemanticsScope, Type, TypeInfo};
use ide_db::{ use ide_db::{
@ -431,12 +433,17 @@ impl<'a> CompletionContext<'a> {
mut fake_ident_token: SyntaxToken, mut fake_ident_token: SyntaxToken,
) { ) {
let _p = profile::span("CompletionContext::expand_and_fill"); let _p = profile::span("CompletionContext::expand_and_fill");
loop { 'expansion: loop {
// Expand attributes let parent_item =
if let (Some(actual_item), Some(item_with_fake_ident)) = ( |item: &ast::Item| item.syntax().ancestors().skip(1).find_map(ast::Item::cast);
find_node_at_offset::<ast::Item>(&original_file, offset), let ancestor_items = iter::successors(
find_node_at_offset::<ast::Item>(&speculative_file, offset), Option::zip(
) { find_node_at_offset::<ast::Item>(&original_file, offset),
find_node_at_offset::<ast::Item>(&speculative_file, offset),
),
|(a, b)| parent_item(a).zip(parent_item(b)),
);
for (actual_item, item_with_fake_ident) in ancestor_items {
match ( match (
self.sema.expand_attr_macro(&actual_item), self.sema.expand_attr_macro(&actual_item),
self.sema.speculative_expand_attr_macro( self.sema.speculative_expand_attr_macro(
@ -445,19 +452,22 @@ impl<'a> CompletionContext<'a> {
fake_ident_token.clone(), fake_ident_token.clone(),
), ),
) { ) {
(Some(actual_expansion), Some(speculative_expansion)) => { // maybe parent items have attributes
let new_offset = speculative_expansion.1.text_range().start(); (None, None) => (),
// successful expansions
(Some(actual_expansion), Some((fake_expansion, fake_mapped_token))) => {
let new_offset = fake_mapped_token.text_range().start();
if new_offset > actual_expansion.text_range().end() { if new_offset > actual_expansion.text_range().end() {
break; break 'expansion;
} }
original_file = actual_expansion; original_file = actual_expansion;
speculative_file = speculative_expansion.0; speculative_file = fake_expansion;
fake_ident_token = speculative_expansion.1; fake_ident_token = fake_mapped_token;
offset = new_offset; offset = new_offset;
continue; continue 'expansion;
} }
(None, None) => (), // exactly one expansion failed, inconsistent state so stop expanding completely
_ => break, _ => break 'expansion,
} }
} }
@ -477,28 +487,31 @@ impl<'a> CompletionContext<'a> {
None => break, None => break,
}; };
if let (Some(actual_expansion), Some(speculative_expansion)) = ( match (
self.sema.expand(&actual_macro_call), self.sema.expand(&actual_macro_call),
self.sema.speculative_expand( self.sema.speculative_expand(
&actual_macro_call, &actual_macro_call,
&speculative_args, &speculative_args,
fake_ident_token, fake_ident_token.clone(),
), ),
) { ) {
let new_offset = speculative_expansion.1.text_range().start(); // successful expansions
if new_offset > actual_expansion.text_range().end() { (Some(actual_expansion), Some((fake_expansion, fake_mapped_token))) => {
break; let new_offset = fake_mapped_token.text_range().start();
if new_offset > actual_expansion.text_range().end() {
break;
}
original_file = actual_expansion;
speculative_file = fake_expansion;
fake_ident_token = fake_mapped_token;
offset = new_offset;
continue;
} }
original_file = actual_expansion; _ => break,
speculative_file = speculative_expansion.0;
fake_ident_token = speculative_expansion.1;
offset = new_offset;
} else {
break;
} }
} else {
break;
} }
break;
} }
self.fill(&original_file, speculative_file, offset); self.fill(&original_file, speculative_file, offset);