2 files changed, 18 insertions, 14 deletions

diff --git a/crates/ra_editor/src/completion.rs b/crates/ra_editor/src/completion.rs
index 8502b337d..0a3675255 100644
--- a/crates/ra_editor/src/completion.rs
+++ b/crates/ra_editor/src/completion.rs
@@ -2,7 +2,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 
 use ra_syntax::{
     algo::visit::{visitor, visitor_ctx, Visitor, VisitorCtx},
-    ast::{self, LoopBodyOwner, ModuleItemOwner},
+    ast::{self, AstChildren, LoopBodyOwner, ModuleItemOwner},
     text_utils::is_subrange,
     AstNode, File,
     SyntaxKind::*,
@@ -65,6 +65,21 @@ pub fn scope_completion(file: &File, offset: TextUnit) -> Option<Vec<CompletionI
     }
 }
 
+pub fn complete_module_items(items: AstChildren<ast::ModuleItem>, this_item: Option<ast::NameRef>, acc: &mut Vec<CompletionItem>) {
+    let scope = ModuleScope::new(items);
+    acc.extend(
+        scope
+            .entries()
+            .iter()
+            .filter(|entry| Some(entry.syntax()) != this_item.map(|it| it.syntax()))
+            .map(|entry| CompletionItem {
+                label: entry.name().to_string(),
+                lookup: None,
+                snippet: None,
+            }),
+    );
+}
+
 fn complete_name_ref(file: &File, name_ref: ast::NameRef, acc: &mut Vec<CompletionItem>) {
     if !is_node::<ast::Path>(name_ref.syntax()) {
         return;
@@ -77,18 +92,7 @@ fn complete_name_ref(file: &File, name_ref: ast::NameRef, acc: &mut Vec<Completi
             .accept(node)
         {
             if let Some(items) = items {
-                let scope = ModuleScope::new(items);
-                acc.extend(
-                    scope
-                        .entries()
-                        .iter()
-                        .filter(|entry| entry.syntax() != name_ref.syntax())
-                        .map(|entry| CompletionItem {
-                            label: entry.name().to_string(),
-                            lookup: None,
-                            snippet: None,
-                        }),
-                );
+                complete_module_items(items, Some(name_ref), acc);
             }
             break;
         } else if !visited_fn {
diff --git a/crates/ra_editor/src/lib.rs b/crates/ra_editor/src/lib.rs
index 94e9a18e4..b73eb4ac7 100644
--- a/crates/ra_editor/src/lib.rs
+++ b/crates/ra_editor/src/lib.rs
@@ -21,7 +21,7 @@ mod typing;
 
 pub use self::{
     code_actions::{add_derive, add_impl, flip_comma, introduce_variable, LocalEdit},
-    completion::{scope_completion, CompletionItem},
+    completion::{scope_completion, complete_module_items, CompletionItem},
     edit::{Edit, EditBuilder},
     extend_selection::extend_selection,
     folding_ranges::{folding_ranges, Fold, FoldKind},