From 9b33721a98e901a1168780d016636dcc6656ee85 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 18 Sep 2015 20:36:13 +0200 Subject: [PATCH] don't try to add auto-import if user closed the project while the popup was displayed (EA-67037 - assert: ComponentManagerImpl.getComponent) --- .../jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt index f5823cfffdd..129517db3d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt @@ -108,7 +108,7 @@ public class KotlinAddImportAction( override fun isAutoSelectionEnabled() = false override fun onChosen(selectedValue: Variant?, finalChoice: Boolean): PopupStep? { - if (selectedValue == null) return null + if (selectedValue == null || project.isDisposed) return null if (finalChoice) { addImport(selectedValue) @@ -123,7 +123,7 @@ public class KotlinAddImportAction( } override fun onChosen(selectedValue: String?, finalChoice: Boolean): PopupStep? { - if (finalChoice) { + if (finalChoice && !project.isDisposed) { AddImportAction.excludeFromImport(project, selectedValue) } return null