Skip to content

[perf] stop blocking on SdkRunConfig.addConsoleFilters #8095

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
Apr 22, 2025
Merged

[perf] stop blocking on SdkRunConfig.addConsoleFilters #8095

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
36 changes: 24 additions & 12 deletions flutter-idea/src/io/flutter/run/SdkRunConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import com.intellij.execution.filters.UrlFilter;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.RunConfigurationWithSuppressedDefaultRunAction;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
Expand All @@ -32,11 +34,13 @@
import com.intellij.refactoring.listeners.RefactoringElementListener;
import com.intellij.refactoring.listeners.UndoRefactoringElementAdapter;
import com.intellij.util.PathUtil;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
import com.intellij.util.xmlb.XmlSerializer;
import com.jetbrains.lang.dart.ide.runner.DartConsoleFilter;
import io.flutter.FlutterUtils;
import io.flutter.console.FlutterConsoleFilter;
import io.flutter.dart.FlutterDartAnalysisServer;
import io.flutter.run.common.RunMode;
import io.flutter.run.daemon.FlutterApp;
import io.flutter.sdk.FlutterSdkManager;
Expand Down Expand Up @@ -222,18 +226,26 @@ protected void addConsoleFilters(@NotNull LaunchState launcher,
@NotNull ExecutionEnvironment env,
@NotNull MainFile mainFile,
@Nullable Module module) {
// Set up additional console filters.
final TextConsoleBuilder builder = launcher.getConsoleBuilder();
// file:, package:, and dart: references
builder.addFilter(new DartConsoleFilter(env.getProject(), mainFile.getFile()));
//// links often found when running tests
//builder.addFilter(new DartRelativePathsConsoleFilter(env.getProject(), mainFile.getAppDir().getPath()));
if (module != null) {
// various flutter run links
builder.addFilter(new FlutterConsoleFilter(module));
}
// general urls
builder.addFilter(new UrlFilter());
// Creating console filters is expensive so we want to make sure we are not blocking.
// See: https://github.com/flutter/flutter-intellij/issues/8089
ReadAction.nonBlocking(() -> {
// Set up additional console filters.
final TextConsoleBuilder builder = launcher.getConsoleBuilder();
if (builder == null) return null;
// file:, package:, and dart: references
builder.addFilter(new DartConsoleFilter(env.getProject(), mainFile.getFile()));
//// links often found when running tests
//builder.addFilter(new DartRelativePathsConsoleFilter(env.getProject(), mainFile.getAppDir().getPath()));
if (module != null) {
// various flutter run links
builder.addFilter(new FlutterConsoleFilter(module));
}
// general urls
builder.addFilter(new UrlFilter());
return null;
})
.expireWith(FlutterDartAnalysisServer.getInstance(getProject()))
.submit(AppExecutorUtil.getAppExecutorService());
}

@NotNull
Expand Down