Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't add () in use items

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-30 16:29:10 +03:00
parent 3ee7a95315
commit c182aab546
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_analysis/src/completion/complete_path.rs
View file

@ -113,4 +113,16 @@ mod tests {
"Foo;Bar",
);
}
#[test]
fn dont_render_function_parens_in_use_item() {
check_reference_completion(
"
//- /lib.rs
mod m { pub fn foo() {} }
use crate::m::f<|>;
",
"foo",
)
}
}

4
crates/ra_analysis/src/completion/completion_context.rs
View file

@ -24,6 +24,7 @@ pub(super) struct CompletionContext<'a> {
pub(super) module: Option<hir::Module>,
pub(super) function: Option<hir::Function>,
pub(super) function_syntax: Option<ast::FnDef<'a>>,
pub(super) use_item_syntax: Option<ast::UseItem<'a>>,
pub(super) is_param: bool,
/// A single-indent path, like `foo`.
pub(super) is_trivial_path: bool,
@ -55,6 +56,7 @@ impl<'a> CompletionContext<'a> {
module,
function: None,
function_syntax: None,
use_item_syntax: None,
is_param: false,
is_trivial_path: false,
path_prefix: None,
@ -114,6 +116,8 @@ impl<'a> CompletionContext<'a> {
_ => (),
}
self.use_item_syntax = self.leaf.ancestors().find_map(ast::UseItem::cast);
self.function_syntax = self
.leaf
.ancestors()

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

@ -140,21 +140,27 @@ impl Builder {
PerNs {
values: Some(hir::Def::Function(function)),
..
} => {
if let Some(sig_info) = function.signature_info(ctx.db) {
if sig_info.params.is_empty() {
self.snippet = Some(format!("{}()$0", self.label));
} else {
self.snippet = Some(format!("{}($0)", self.label));
}
}
CompletionItemKind::Function
}
} => return self.from_function(ctx, function),
_ => return self,
};
self.kind = Some(kind);
self
}
fn from_function(mut self, ctx: &CompletionContext, function: hir::Function) -> Builder {
// If not an import, add parenthesis automatically.
if ctx.use_item_syntax.is_none() {
if let Some(sig_info) = function.signature_info(ctx.db) {
if sig_info.params.is_empty() {
self.snippet = Some(format!("{}()$0", self.label));
} else {
self.snippet = Some(format!("{}($0)", self.label));
}
}
}
self.kind = Some(CompletionItemKind::Function);
self
}
}
impl Into<CompletionItem> for Builder {