Skip to content

[PERF] migrate Project parentDisposables to Services #8178

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
merged 1 commit into from
May 9, 2025
Merged

[PERF] migrate Project parentDisposables to Services #8178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion flutter-idea/src/io/flutter/bazel/WorkspaceCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private WorkspaceCache(@NotNull final Project project) {
FileWatch nextWatch = null;
if (next != null) {
nextWatch = FileWatch.subscribe(next.getRoot(), next.getDependencies(), this::scheduleRefresh);
nextWatch.setDisposeParent(project);
nextWatch.setDisposeParent(FlutterDartAnalysisServer.getInstance(project));
}

final FileWatch prevWatch = fileWatch.getAndSet(nextWatch);
Expand Down
2 changes: 0 additions & 2 deletions flutter-idea/src/io/flutter/dart/FlutterDartAnalysisServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.Consumer;
import com.jetbrains.lang.dart.analyzer.DartAnalysisServerService;
import io.flutter.utils.JsonUtils;
Expand Down Expand Up @@ -100,7 +99,6 @@ public void computedErrors(String file, List<AnalysisError> errors) {
super.computedErrors(file, errors);
}
});
Disposer.register(project, this);
}

public void addOutlineListener(@NotNull final String filePath, @NotNull final FlutterOutlineListener listener) {
Expand Down
4 changes: 3 additions & 1 deletion flutter-idea/src/io/flutter/run/FlutterReloadManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import io.flutter.actions.ReloadFlutterApp;
import io.flutter.bazel.Workspace;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.run.common.RunMode;
import io.flutter.run.daemon.FlutterApp;
import io.flutter.settings.FlutterSettings;
Expand Down Expand Up @@ -127,7 +128,8 @@ public static FlutterReloadManager getInstance(@NotNull Project project) {
private FlutterReloadManager(@NotNull Project project) {
this.myProject = project;

final MessageBusConnection connection = ApplicationManager.getApplication().getMessageBus().connect(project);
final MessageBusConnection connection =
ApplicationManager.getApplication().getMessageBus().connect(FlutterDartAnalysisServer.getInstance(project));
connection.subscribe(AnActionListener.TOPIC, new AnActionListener() {
private @Nullable Project eventProject;
private @Nullable Editor eventEditor;
Expand Down
4 changes: 3 additions & 1 deletion flutter-idea/src/io/flutter/run/common/CommonTestConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.jetbrains.lang.dart.psi.DartCallExpression;
import com.jetbrains.lang.dart.psi.DartStringLiteralExpression;
import io.flutter.dart.DartSyntax;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.editor.ActiveEditorsOutlineService;
import io.flutter.utils.OpenApiUtils;
import org.dartlang.analysis.server.protocol.ElementKind;
Expand Down Expand Up @@ -173,7 +174,8 @@ private LineMarkerUpdatingListener getListenerForFile(@NotNull final PsiFile fil
final ActiveEditorsOutlineService service = getActiveEditorsOutlineService(file.getProject());
if (!listenerCache.containsKey(path) && service != null) {
listenerCache.put(path, new LineMarkerUpdatingListener(this, file.getProject(), service));
Disposer.register(file.getProject(), () -> {
var disposableParent = FlutterDartAnalysisServer.getInstance(file.getProject());
Disposer.register(disposableParent, () -> {
listenerCache.remove(path);
});
}
Expand Down
6 changes: 4 additions & 2 deletions flutter-idea/src/io/flutter/run/daemon/DeviceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.flutter.FlutterMessages;
import io.flutter.FlutterUtils;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.run.FlutterDevice;
import io.flutter.sdk.AndroidEmulatorManager;
import io.flutter.sdk.FlutterSdkManager;
Expand Down Expand Up @@ -63,7 +64,7 @@ public static DeviceService getInstance(@NotNull final Project project) {
private DeviceService(@NotNull final Project project) {
this.project = project;

deviceDaemon.setDisposeParent(project);
deviceDaemon.setDisposeParent(FlutterDartAnalysisServer.getInstance(project));
deviceDaemon.subscribe(this::refreshDeviceSelection);
refreshDeviceDaemon();

Expand All @@ -80,7 +81,8 @@ public void flutterSdkRemoved() {
}
};
FlutterSdkManager.getInstance(project).addListener(sdkListener);
Disposer.register(project, () -> FlutterSdkManager.getInstance(project).removeListener(sdkListener));
Disposer.register(FlutterDartAnalysisServer.getInstance(project),
() -> FlutterSdkManager.getInstance(project).removeListener(sdkListener));

// Watch for Bazel workspace changes.
WorkspaceCache.getInstance(project).subscribe(this::refreshDeviceDaemon);
Expand Down
3 changes: 2 additions & 1 deletion flutter-idea/src/io/flutter/run/daemon/FlutterApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.flutter.ObservatoryConnector;
import io.flutter.bazel.Workspace;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.logging.FlutterConsoleLogManager;
import io.flutter.pub.PubRoot;
import io.flutter.pub.PubRoots;
Expand Down Expand Up @@ -260,7 +261,7 @@ public static FlutterApp start(@NotNull ExecutionEnvironment env,
}

final ProcessHandler process = new MostlySilentColoredProcessHandler(command, onTextAvailable);
Disposer.register(project, process::destroyProcess);
Disposer.register(FlutterDartAnalysisServer.getInstance(project), process::destroyProcess);

final DaemonApi api = new DaemonApi(process);
final FlutterApp app = new FlutterApp(project, module, mode, device, process, env, api, command);
Expand Down
9 changes: 6 additions & 3 deletions flutter-idea/src/io/flutter/sdk/FlutterPluginsLibraryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
import io.flutter.pub.PubRoots;
import org.jetbrains.annotations.NotNull;

import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

import static com.jetbrains.lang.dart.util.PubspecYamlUtil.PUBSPEC_YAML;
Expand All @@ -42,6 +44,7 @@ public FlutterPluginsLibraryManager(@NotNull Project project) {
}

public void startWatching() {
var project = getProject();
VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileContentsChangedAdapter() {
@Override
protected void onFileChange(@NotNull VirtualFile file) {
Expand All @@ -51,9 +54,9 @@ protected void onFileChange(@NotNull VirtualFile file) {
@Override
protected void onBeforeFileChange(@NotNull VirtualFile file) {
}
}, getProject());
}, FlutterDartAnalysisServer.getInstance(project));

getProject().getMessageBus().connect().subscribe(ModuleRootListener.TOPIC, new ModuleRootListener() {
project.getMessageBus().connect().subscribe(ModuleRootListener.TOPIC, new ModuleRootListener() {
@Override
public void rootsChanged(@NotNull ModuleRootEvent event) {
scheduleUpdate();
Expand Down
3 changes: 2 additions & 1 deletion flutter-idea/src/io/flutter/sdk/FlutterSdkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.EventDispatcher;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.utils.OpenApiUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -48,7 +49,7 @@ private FlutterSdkManager(@NotNull Project project) {
final ScheduledFuture timer = JobScheduler.getScheduler().scheduleWithFixedDelay(
this::checkForFlutterSdkChange, 1, 1, TimeUnit.SECONDS);

Disposer.register(project, () -> {
Disposer.register(FlutterDartAnalysisServer.getInstance(project), () -> {
libraryTable.removeListener(libraryTableListener);
timer.cancel(false);
});
Expand Down
22 changes: 12 additions & 10 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 @@ -7,10 +7,6 @@

//import static com.android.tools.idea.gradle.project.importing.GradleProjectImporter.ANDROID_PROJECT_TYPE;

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

import com.android.tools.idea.gradle.project.sync.GradleSyncListener;
import com.android.tools.idea.gradle.project.sync.GradleSyncState;
import com.intellij.debugger.engine.DebugProcess;
Expand All @@ -22,25 +18,32 @@
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.*;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectType;
import com.intellij.openapi.project.ProjectTypeService;
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 org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static com.intellij.util.ReflectionUtil.findAssignableField;
import static io.flutter.actions.AttachDebuggerAction.ATTACH_IS_ACTIVE;
import static io.flutter.actions.AttachDebuggerAction.findRunConfig;

public class AddToAppUtils {
//private static final Logger LOG = Logger.getInstance(AddToAppUtils.class);
Expand All @@ -49,7 +52,7 @@ private AddToAppUtils() {
}

public static boolean initializeAndDetectFlutter(@NotNull Project project) {
MessageBusConnection connection = project.getMessageBus().connect(project);
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");
Expand All @@ -71,7 +74,6 @@ public void modulesAdded(@NotNull Project proj, @NotNull List<? extends Module>
});
}
}

}
});
return false;
Expand Down