From e92d3998deb22fbf060826fbfc0c0461d214d65e Mon Sep 17 00:00:00 2001
From: Nicolay Mitropolsky <Nicolay.Mitropolsky@jetbrains.com>
Date: Mon, 13 Aug 2018 19:09:05 +0300
Subject: [PATCH] `KotlinLanguageInjectionSupport`: remove calling
 `replaceInjectionsWithUndo` on removing of in-place injection

---
 .../injection/KotlinLanguageInjectionSupport.kt   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjectionSupport.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjectionSupport.kt
index c429733bb4a..503a843c8e5 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjectionSupport.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjectionSupport.kt
@@ -76,15 +76,16 @@ class KotlinLanguageInjectionSupport : AbstractLanguageInjectionSupport() {
 
         val project = psiElement.getProject()
 
-        val injectionAnnotation = findAnnotationInjection(psiElement)
-        val injectionComment = findInjectionComment(psiElement)
-
-        val injectInstructions = listOf(injectionAnnotation, injectionComment).filterNotNull()
-
-        val configuration = Configuration.getProjectInstance(project)
+        val injectInstructions = listOfNotNull(
+            findAnnotationInjection(psiElement),
+            findInjectionComment(psiElement)
+        )
 
         TemporaryPlacesRegistry.getInstance(project).removeHostWithUndo(project, psiElement)
-        configuration.replaceInjectionsWithUndo(project, listOf(), listOf(), injectInstructions)
+
+        project.executeWriteCommand("remove injection in-code instructions") {
+            injectInstructions.forEach(PsiElement::delete)
+        }
 
         return true
     }