language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-04 23:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed bug that allowed for completion in a nested method.

Browse source
This commit is contained in:
Kevin DeLorey 2020-02-15 09:50:07 -06:00
parent fc13b7fc9a
commit ae8ae650fc
1 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

43
crates/ra_ide/src/completion/complete_trait_impl.rs
View file

@ -17,7 +17,10 @@ use crate::{
pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext) { pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext) {
let trigger = ctx.token.ancestors().find(|p| match p.kind() { let trigger = ctx.token.ancestors().find(|p| match p.kind() {
SyntaxKind::FN_DEF | SyntaxKind::TYPE_ALIAS_DEF | SyntaxKind::CONST_DEF => true, SyntaxKind::FN_DEF
| SyntaxKind::TYPE_ALIAS_DEF
| SyntaxKind::CONST_DEF
| SyntaxKind::BLOCK_EXPR => true,
_ => false, _ => false,
}); });
@ -98,10 +101,9 @@ fn add_function_impl(
let snippet = format!("{} {{}}", display); let snippet = format!("{} {{}}", display);
builder let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end());
.text_edit(TextEdit::replace(fn_def_node.text_range(), snippet))
.kind(completion_kind) builder.text_edit(TextEdit::replace(range, snippet)).kind(completion_kind).add_to(acc);
.add_to(acc);
} }
fn add_type_alias_impl( fn add_type_alias_impl(
@ -114,8 +116,10 @@ fn add_type_alias_impl(
let snippet = format!("type {} = ", alias_name); let snippet = format!("type {} = ", alias_name);
let range = TextRange::from_to(type_def_node.text_range().start(), ctx.source_range().end());
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone()) CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
.text_edit(TextEdit::replace(type_def_node.text_range(), snippet)) .text_edit(TextEdit::replace(range, snippet))
.lookup_by(alias_name) .lookup_by(alias_name)
.kind(CompletionItemKind::TypeAlias) .kind(CompletionItemKind::TypeAlias)
.set_documentation(type_alias.docs(ctx.db)) .set_documentation(type_alias.docs(ctx.db))
@ -133,8 +137,11 @@ fn add_const_impl(
if let Some(const_name) = const_name { if let Some(const_name) = const_name {
let snippet = make_const_compl_syntax(&const_.source(ctx.db).value); let snippet = make_const_compl_syntax(&const_.source(ctx.db).value);
let range =
TextRange::from_to(const_def_node.text_range().start(), ctx.source_range().end());
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone()) CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
.text_edit(TextEdit::replace(const_def_node.text_range(), snippet)) .text_edit(TextEdit::replace(range, snippet))
.lookup_by(const_name) .lookup_by(const_name)
.kind(CompletionItemKind::Const) .kind(CompletionItemKind::Const)
.set_documentation(const_.docs(ctx.db)) .set_documentation(const_.docs(ctx.db))
@ -235,6 +242,28 @@ mod tests {
"###); "###);
} }
#[test]
fn completes_only_on_top_level() {
let completions = complete(
r"
trait Test {
fn foo();
fn foo_bar();
}
struct T1;
impl Test for T1 {
fn foo() {
<|>
}
}
",
);
assert_debug_snapshot!(completions, @r###"[]"###);
}
#[test] #[test]
fn generic_fn() { fn generic_fn() {
let completions = complete( let completions = complete(