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

Don't ask for modules in disposed project

Browse Source
This commit is contained in:
Nikolay Krasko
2013-10-25 20:49:08 +04:00
parent 2b3a6b5f57
commit ec42bfd1b2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
+6 -4
View File
@@ -30,10 +30,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
public class ConfigureKotlinInProjectUtils { public class ConfigureKotlinInProjectUtils {
public static boolean isProjectConfigured(@NotNull Project project) { public static boolean isProjectConfigured(@NotNull Project project) {
@@ -65,6 +62,10 @@ public class ConfigureKotlinInProjectUtils {
} }
public static Collection<Module> getModulesWithKotlinFiles(@NotNull Project project) { public static Collection<Module> getModulesWithKotlinFiles(@NotNull Project project) {
if (project.isDisposed()) {
return Collections.emptyList();
}
List<Module> modulesWithKotlin = Lists.newArrayList(); List<Module> modulesWithKotlin = Lists.newArrayList();
for (Module module : ModuleManager.getInstance(project).getModules()) { for (Module module : ModuleManager.getInstance(project).getModules()) {
if (hasKotlinFilesInSources(module) || hasKotlinFilesOnlyInTests(module)) { if (hasKotlinFilesInSources(module) || hasKotlinFilesOnlyInTests(module)) {
@@ -87,6 +88,7 @@ public class ConfigureKotlinInProjectUtils {
} }
private static void showConfigureKotlinNotification(@NotNull Project project) { private static void showConfigureKotlinNotification(@NotNull Project project) {
//noinspection StaticFieldReferencedViaSubclass
ConfigureKotlinNotificationManager.instance$.notify(project); ConfigureKotlinNotificationManager.instance$.notify(project);
} }