From 72076749c2a26bc4c031cc9bc093edc7040ea536 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 14 Jan 2019 18:57:57 -0500 Subject: [PATCH] guard against disposed when querying project type (#3081) --- src/io/flutter/utils/FlutterModuleUtils.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/io/flutter/utils/FlutterModuleUtils.java b/src/io/flutter/utils/FlutterModuleUtils.java index 8f7dd5a03e..283a8ddd1e 100644 --- a/src/io/flutter/utils/FlutterModuleUtils.java +++ b/src/io/flutter/utils/FlutterModuleUtils.java @@ -5,17 +5,11 @@ */ package io.flutter.utils; -import static io.flutter.sdk.FlutterSdk.DART_SDK_SUFFIX; - import com.intellij.execution.RunManager; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileEditorManager; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.ModuleTypeManager; -import com.intellij.openapi.module.ModuleUtilCore; +import com.intellij.openapi.module.*; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -35,10 +29,13 @@ import io.flutter.run.SdkRunConfig; import io.flutter.sdk.FlutterSdk; import io.flutter.sdk.FlutterSdkUtil; -import java.util.List; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + +import static io.flutter.sdk.FlutterSdk.DART_SDK_SUFFIX; + public class FlutterModuleUtils { public static final String DEPRECATED_FLUTTER_MODULE_TYPE_ID = "WEB_MODULE"; @@ -179,6 +176,9 @@ public static Module[] getModules(@NotNull Project project) { * Check if any module in this project {@link #declaresFlutter(Module)}. */ public static boolean declaresFlutter(@NotNull Project project) { + if (project.isDisposed()) { + return false; + } return CollectionUtils.anyMatch(getModules(project), FlutterModuleUtils::declaresFlutter); }