From f5669dfc56b2b64d79f368eefed13dd75a6f027b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 1 Sep 2018 12:46:43 +0300
Subject: No self-imports in completion

---
 crates/libeditor/src/completion.rs      | 8 ++++++++
 crates/libeditor/src/scope/mod_scope.rs | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/crates/libeditor/src/completion.rs b/crates/libeditor/src/completion.rs
index f3058c023..be37fb6bf 100644
--- a/crates/libeditor/src/completion.rs
+++ b/crates/libeditor/src/completion.rs
@@ -42,6 +42,7 @@ pub fn scope_completion(file: &File, offset: TextUnit) -> Option<Vec<CompletionI
         let scope = ModuleScope::new(root);
         res.extend(
             scope.entries().iter()
+                .filter(|entry| entry.syntax() != name_ref.syntax())
                 .map(|entry| CompletionItem {
                     name: entry.name().to_string(),
                     snippet: None,
@@ -232,6 +233,13 @@ mod tests {
                    CompletionItem { name: "quux", snippet: None }]"#);
     }
 
+    #[test]
+    fn test_completion_mod_scope_no_self_use() {
+        check_scope_completion(r"
+            use foo<|>;
+            ", r#"[]"#);
+    }
+
     #[test]
     fn test_complete_type() {
         check_scope_completion(r"
diff --git a/crates/libeditor/src/scope/mod_scope.rs b/crates/libeditor/src/scope/mod_scope.rs
index 052f70569..67baa8678 100644
--- a/crates/libeditor/src/scope/mod_scope.rs
+++ b/crates/libeditor/src/scope/mod_scope.rs
@@ -1,5 +1,5 @@
 use libsyntax2::{
-    AstNode, SyntaxNode, SmolStr, ast
+    AstNode, SyntaxNode, SyntaxNodeRef, SmolStr, ast
 };
 
 pub struct ModuleScope {
@@ -67,6 +67,9 @@ impl Entry {
                     .text(),
         }
     }
+    pub fn syntax(&self) -> SyntaxNodeRef {
+        self.node.borrowed()
+    }
 }
 
 fn collect_imports(tree: ast::UseTree, acc: &mut Vec<Entry>) {
-- 
cgit v1.2.3