Skip to content

[CQ] remove dead GRADLE_SYNC_TOPIC subscriptions #8218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pq merged 2 commits into from
May 23, 2025
Merged

[CQ] remove dead GRADLE_SYNC_TOPIC subscriptions #8218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9206ea0
[CQ] remove dead GRADLE_SYNC_TOPIC subscriptions
pq May 23, 2025
3680ea1
Merge branch 'master' into cq_uncheckedReflection
pq May 23, 2025
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
65 changes: 5 additions & 60 deletions flutter-studio/src/io/flutter/utils/AddToAppUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/
package io.flutter.utils;

import com.android.tools.idea.gradle.project.sync.GradleSyncListener;
import com.android.tools.idea.gradle.project.sync.GradleSyncState;
import com.intellij.debugger.engine.DebugProcess;
import com.intellij.debugger.engine.DebugProcessListener;
import com.intellij.debugger.impl.DebuggerManagerListener;
Expand All @@ -23,23 +21,18 @@
import com.intellij.util.ThreeState;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.messages.Topic;
import io.flutter.FlutterUtils;
import io.flutter.actions.AttachDebuggerAction;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.pub.PubRoot;
import io.flutter.run.SdkAttachConfig;
import io.flutter.sdk.FlutterSdk;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.List;

import static com.intellij.util.ReflectionUtil.findAssignableField;
import static io.flutter.actions.AttachDebuggerAction.ATTACH_IS_ACTIVE;
import static io.flutter.actions.AttachDebuggerAction.findRunConfig;

Expand All @@ -49,13 +42,12 @@ private AddToAppUtils() {
}

public static boolean initializeAndDetectFlutter(@NotNull Project project) {
// In 2019, we added some logic to reflectively access a not-yet public GRADLE_SYNC_TOPIC on `GradleSyncState` subscribing
// a listener that called `GradleUtils.checkDartSupport()` on all sync events.
// Sometime since then, the field has gone away entirely and we are not getting these notifications.
// TODO(pq): 5/23/25 Asses whether we want to try and restore this logic

MessageBusConnection connection = project.getMessageBus().connect(FlutterDartAnalysisServer.getInstance(project));
// GRADLE_SYNC_TOPIC is not public in Android Studio 3.5. It is in 3.6. It isn't defined in 3.4.
//noinspection unchecked
Topic<GradleSyncListener> topic = getStaticFieldValue(GradleSyncState.class, Topic.class, "GRADLE_SYNC_TOPIC");
if (topic != null) {
connection.subscribe(topic, makeSyncListener());
}

if (!FlutterModuleUtils.hasFlutterModule(project)) {
connection.subscribe(ModuleListener.TOPIC, new ModuleListener() {
Expand Down Expand Up @@ -89,53 +81,6 @@ public void modulesAdded(@NotNull Project proj, @NotNull List<? extends Module>
return true;
}

// Derived from the method in ReflectionUtil, with the addition of setAccessible().
@Nullable
public static <T> T getStaticFieldValue(@NotNull Class<?> objectClass,
@Nullable("null means any type") Class<T> fieldType,
@NotNull @NonNls String fieldName) {
try {
final Field field = findAssignableField(objectClass, fieldType, fieldName);
if (!Modifier.isStatic(field.getModifiers())) {
throw new IllegalArgumentException("Field " + objectClass + "." + fieldName + " is not static");
}
field.setAccessible(true);

var value = field.get(null);
if (value == null) return null;

if (fieldType.isInstance(value)) {
return fieldType.cast(value); // Type-safe cast
}

// If `fieldType` is too broad, we might get here.
return null;
}
catch (NoSuchFieldException | IllegalAccessException e) {
return null;
}
}

@NotNull
private static GradleSyncListener makeSyncListener() {
return new GradleSyncListener() {
@Override
public void syncSucceeded(@NotNull Project project) {
GradleUtils.checkDartSupport(project);
}

@Override
public void syncFailed(@NotNull Project project, @NotNull String errorMessage) {
GradleUtils.checkDartSupport(project);
}

@Override
public void syncSkipped(@NotNull Project project) {
GradleUtils.checkDartSupport(project);
}
};
}

@NotNull
private static DebuggerManagerListener makeAddToAppAttachListener(@NotNull Project project) {
return new DebuggerManagerListener() {
Expand Down