language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

switch completion to new scope

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-21 12:57:05 +03:00
parent b70b6bce19
commit 049f8df93c
9 changed files with 69 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_analysis/src/completion/mod.rs
View file

@ -204,9 +204,9 @@ mod tests {
<|>
}
",
r#"[CompletionItem { label: "Foo", lookup: None, snippet: None },
CompletionItem { label: "Baz", lookup: None, snippet: None },
CompletionItem { label: "quux", lookup: None, snippet: None }]"#,
r#"[CompletionItem { label: "quux", lookup: None, snippet: None },
CompletionItem { label: "Foo", lookup: None, snippet: None },
CompletionItem { label: "Baz", lookup: None, snippet: None }]"#,
);
}
@ -230,8 +230,8 @@ mod tests {
fn quux() { <|> }
}
",
r#"[CompletionItem { label: "Bar", lookup: None, snippet: None },
CompletionItem { label: "quux", lookup: None, snippet: None }]"#,
r#"[CompletionItem { label: "quux", lookup: None, snippet: None },
CompletionItem { label: "Bar", lookup: None, snippet: None }]"#,
);
}

26
crates/ra_analysis/src/completion/reference_completion.rs
View file

@ -39,14 +39,17 @@ pub(super) fn completions(
let module_scope = module.scope(db)?;
acc.extend(
module_scope
.entries()
.items
.iter()
.filter(|entry| {
.filter(|(_name, res)| {
// Don't expose this item
!entry.ptr().range().is_subrange(&name_ref.syntax().range())
match res.import_name {
None => true,
Some(ptr) => !ptr.range().is_subrange(&name_ref.syntax().range()),
}
})
.map(|entry| CompletionItem {
label: entry.name().to_string(),
.map(|(name, _res)| CompletionItem {
label: name.to_string(),
lookup: None,
snippet: None,
}),
@ -173,11 +176,14 @@ fn complete_path(
Some(it) => it,
};
let module_scope = target_module.scope(db)?;
let completions = module_scope.entries().iter().map(|entry| CompletionItem {
label: entry.name().to_string(),
lookup: None,
snippet: None,
});
let completions = module_scope
.items
.iter()
.map(|(name, _res)| CompletionItem {
label: name.to_string(),
lookup: None,
snippet: None,
});
acc.extend(completions);
Ok(())
}