Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/io/flutter/FlutterUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/
package io.flutter;

import com.android.tools.idea.IdeInfo;
import com.google.common.base.Charsets;
import com.intellij.ide.actions.ShowSettingsUtilImpl;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.module.Module;
Expand Down Expand Up @@ -47,6 +47,8 @@

import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.file.Paths;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -89,7 +91,18 @@ public static boolean isDartFile(@NotNull VirtualFile file) {
}

public static boolean isAndroidStudio() {
return IdeInfo.getInstance().isAndroidStudio();
try {
// The class is available if the IDE has the "Android" plugin installed or is Android Studio.
final Class<?> ideInfoClass = Class.forName("com.android.tools.idea.IdeInfo");
final Method getInstance = ideInfoClass.getMethod("getInstance");
final Object instance = getInstance.invoke(null);
final Method isAndroidStudio = ideInfoClass.getMethod("isAndroidStudio");
return (Boolean)isAndroidStudio.invoke(instance);
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
// Fall back to checking application name
// e.g., "Android Studio Meerkat | 2024.3.1"
return ApplicationInfo.getInstance().getFullApplicationName().startsWith("Android Studio");
}
}

/**
Expand Down Expand Up @@ -416,7 +429,7 @@ protected void addImplicitResolvers() {
return null;
}
}

@Nullable
private static VirtualFile getFlutterManagedAndroidDir(VirtualFile dir) {
final VirtualFile meta = dir.findChild(".metadata");
Expand Down