azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinLanguageInjectionSupport: remove calling replaceInjectionsWithUndo on removing of in-place injection

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-08-13 19:09:05 +03:00
parent cd047b9605
commit e92d3998de
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjectionSupport.kt
+8 -7
View File
@@ -76,15 +76,16 @@ class KotlinLanguageInjectionSupport : AbstractLanguageInjectionSupport() {
val project = psiElement.getProject() val project = psiElement.getProject()
val injectionAnnotation = findAnnotationInjection(psiElement) val injectInstructions = listOfNotNull(
val injectionComment = findInjectionComment(psiElement) findAnnotationInjection(psiElement),
findInjectionComment(psiElement)
val injectInstructions = listOf(injectionAnnotation, injectionComment).filterNotNull() )
val configuration = Configuration.getProjectInstance(project)
TemporaryPlacesRegistry.getInstance(project).removeHostWithUndo(project, 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 return true
} }