3 files changed, 18 insertions, 16 deletions

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 0f866e6c2..ce80be17f 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -14,12 +14,8 @@ use crate::{
     generics::GenericParams,
     expr::{scope::{ExprScopes, ScopeId}, PatId},
     impl_block::ImplBlock,
-<<<<<<< HEAD
     path::Path,
     Trait
-=======
-    path::Path, Trait,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
 };
 
 #[derive(Debug, Clone, Default)]
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index a6f0ab289..42399622a 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -19,11 +19,7 @@ use ra_syntax::{
 
 use crate::{
     HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name,
-<<<<<<< HEAD
-    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty,
-=======
-    AsName, Module, HirFileId, Crate, Trait, Resolver, ImportResolver,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
+    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty, ImportResolver,
     expr::{BodySourceMap, scope::{ScopeId, ExprScopes}},
     ids::LocationCtx,
     expr, AstId,
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 63d475823..5bd5376c9 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -23,13 +23,23 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
                 );
                 builder.finish()
             };
-            CompletionItem::new(
-                CompletionKind::Reference,
-                ctx.source_range(),
-                build_import_label(&name, &path),
-            )
-            .text_edit(edit)
-            .add_to(acc)
+
+            // Hack: copied this check form conv.rs beacause auto import can produce edits
+            // that invalidate assert in conv_with.
+            if edit
+                .as_atoms()
+                .iter()
+                .filter(|atom| !ctx.source_range().is_subrange(&atom.delete))
+                .all(|atom| ctx.source_range().intersection(&atom.delete).is_none())
+            {
+                CompletionItem::new(
+                    CompletionKind::Reference,
+                    ctx.source_range(),
+                    build_import_label(&name, &path),
+                )
+                .text_edit(edit)
+                .add_to(acc);
+            }
         });
     }
 }