1 files changed, 21 insertions, 15 deletions

diff --git a/crates/ra_analysis/src/completion/completion_item.rs b/crates/ra_analysis/src/completion/completion_item.rs
index b8fa39ae3..cd4d529f9 100644
--- a/crates/ra_analysis/src/completion/completion_item.rs
+++ b/crates/ra_analysis/src/completion/completion_item.rs
@@ -1,7 +1,7 @@
-use crate::db;
-
 use hir::PerNs;
 
+use crate::completion::CompletionContext;
+
 /// `CompletionItem` describes a single completion variant in the editor pop-up.
 /// It is basically a POD with various properties. To construct a
 /// `CompletionItem`, use `new` method and the `Builder` struct.
@@ -118,12 +118,12 @@ impl Builder {
         self.kind = Some(kind);
         self
     }
-    pub(crate) fn from_resolution(
+    pub(super) fn from_resolution(
         mut self,
-        db: &db::RootDatabase,
+        ctx: &CompletionContext,
         resolution: &hir::Resolution,
     ) -> Builder {
-        let resolved = resolution.def_id.and_then(|d| d.resolve(db).ok());
+        let resolved = resolution.def_id.and_then(|d| d.resolve(ctx.db).ok());
         let kind = match resolved {
             PerNs {
                 types: Some(hir::Def::Module(..)),
@@ -140,21 +140,27 @@ impl Builder {
             PerNs {
                 values: Some(hir::Def::Function(function)),
                 ..
-            } => {
-                if let Some(sig_info) = function.signature_info(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 {