From ec42bfd1b236bcbdfc71989833b8d50b389d678a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 25 Oct 2013 20:49:08 +0400 Subject: [PATCH] Don't ask for modules in disposed project --- .../configuration/ConfigureKotlinInProjectUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java b/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java index de01b77ecad..10b4d28f9ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java @@ -30,10 +30,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetFileType; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; public class ConfigureKotlinInProjectUtils { public static boolean isProjectConfigured(@NotNull Project project) { @@ -65,6 +62,10 @@ public class ConfigureKotlinInProjectUtils { } public static Collection getModulesWithKotlinFiles(@NotNull Project project) { + if (project.isDisposed()) { + return Collections.emptyList(); + } + List modulesWithKotlin = Lists.newArrayList(); for (Module module : ModuleManager.getInstance(project).getModules()) { if (hasKotlinFilesInSources(module) || hasKotlinFilesOnlyInTests(module)) { @@ -87,6 +88,7 @@ public class ConfigureKotlinInProjectUtils { } private static void showConfigureKotlinNotification(@NotNull Project project) { + //noinspection StaticFieldReferencedViaSubclass ConfigureKotlinNotificationManager.instance$.notify(project); }