Migrate usages of ProjectTypeService.getProjectType(..) (#7872)

https://github.com/JetBrains/intellij-community/blob/b68fd84f1e958485be2e7d3df46a6703101b43df/platform/projectModel-api/src/com/intellij/openapi/project/ProjectTypeService.java#L37
flutter · Dec 20, 2024 · 03a5e44 · 03a5e44
1 parent 2774b17
commit 03a5e44
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/flutter-idea/src/io/flutter/ProjectOpenActivity.java b/flutter-idea/src/io/flutter/ProjectOpenActivity.java
@@ -34,6 +34,8 @@
 import org.jetbrains.android.facet.AndroidFrameworkDetector;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
+
 /**
  * Runs startup actions just after a project is opened, before it's indexed.
  *
@@ -69,9 +71,12 @@ public void runActivity(@NotNull Project project) {
     ApplicationManager.getApplication().executeOnPooledThread(() -> {
       sdk.queryFlutterConfig("android-studio-dir", false);
     });
-    if (FlutterUtils.isAndroidStudio() && !FLUTTER_PROJECT_TYPE.equals(ProjectTypeService.getProjectType(project))) {
-      if (!AndroidUtils.isAndroidProject(project)) {
-        ProjectTypeService.setProjectType(project, FLUTTER_PROJECT_TYPE);
+    Collection<ProjectType> projectTypes = ProjectTypeService.getProjectTypes(project);
+    for (ProjectType projectType : projectTypes) {
+      if (projectType != null && FlutterUtils.isAndroidStudio() && !FLUTTER_PROJECT_TYPE.equals(projectType)) {
+        if (!AndroidUtils.isAndroidProject(project)) {
+          ProjectTypeService.setProjectType(project, FLUTTER_PROJECT_TYPE);
+        }
       }
     }
 
@@ -102,10 +107,12 @@ private static void excludeAndroidFrameworkDetector(@NotNull Project project) {
         if (!excludesConfiguration.isExcludedFromDetection(type)) {
           excludesConfiguration.addExcludedFramework(type);
         }
-      } catch (NullPointerException ignored) {
+      }
+      catch (NullPointerException ignored) {
         // If the Android facet has not been configured then getFrameworkType() throws a NPE.
       }
-    } catch (NoClassDefFoundError ignored) {
+    }
+    catch (NoClassDefFoundError ignored) {
       // This should never happen. But just in case ...
     }
   }

diff --git a/flutter-idea/src/io/flutter/utils/AndroidUtils.java b/flutter-idea/src/io/flutter/utils/AndroidUtils.java
@@ -16,6 +16,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 // based on: org.jetbrains.android.util.AndroidUtils
 @SuppressWarnings("LocalCanBeFinal")
 public class AndroidUtils {
@@ -127,7 +129,10 @@ public static boolean isAndroidProject(@Nullable Project project) {
     // IntelliJ-created Android project we need to set it. We need to allow an alternative
     // name. GradleResourceCompilerConfigurationGenerator depends on "Android".
     // TODO(messick) Recognize both native Android Studio and IntelliJ Android projects.
-    ProjectType projectType = ProjectTypeService.getProjectType(project);
-    return projectType != null && "Android".equals(projectType.getId());
+    Collection<ProjectType> projectTypes = ProjectTypeService.getProjectTypes(project);
+    for (ProjectType projectType : projectTypes) {
+      return projectType != null && "Android".equals(projectType.getId());
+    }
+    return false;
   }
 }
diff --git a/flutter-studio/src/io/flutter/utils/AddToAppUtils.java b/flutter-studio/src/io/flutter/utils/AddToAppUtils.java
@@ -35,6 +35,7 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Collection;
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -71,10 +72,12 @@ public void moduleAdded(@NotNull Project proj, @NotNull Module mod) {
       return false;
     }
     else {
-      @Nullable ProjectType projectType = ProjectTypeService.getProjectType(project);
-      if (projectType != null && "Android".equals(projectType.getId())) {
-        // This is an add-to-app project.
-        connection.subscribe(DebuggerManagerListener.TOPIC, makeAddToAppAttachListener(project));
+      Collection<ProjectType> projectTypes = ProjectTypeService.getProjectTypes(project);
+      for(ProjectType projectType : projectTypes) {
+        if (projectType != null && "Android".equals(projectType.getId())) {
+          // This is an add-to-app project.
+          connection.subscribe(DebuggerManagerListener.TOPIC, makeAddToAppAttachListener(project));
+        }
       }
     }
     return true;