Skip to content

Commit 3f38bfc

Browse files
authored
[verifier] migrate off deprecated ProcessAdapter (#8779)
Tidy up some lingering `ProcessAdapter` references. (Wildcard imports borked my previous `grep` -- note to self: don't use grep AND avoid wildcards!) See: #8764 --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent 383e872 commit 3f38bfc

4 files changed

Lines changed: 37 additions & 8 deletions

File tree

src/io/flutter/run/bazelTest/BazelTestRunner.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
import com.intellij.execution.configurations.RunProfileState;
1616
import com.intellij.execution.executors.DefaultDebugExecutor;
1717
import com.intellij.execution.executors.DefaultRunExecutor;
18-
import com.intellij.execution.process.*;
18+
import com.intellij.execution.process.ProcessEvent;
19+
import com.intellij.execution.process.ProcessHandler;
20+
import com.intellij.execution.process.ProcessListener;
21+
import com.intellij.execution.process.ProcessOutputTypes;
1922
import com.intellij.execution.runners.ExecutionEnvironment;
2023
import com.intellij.execution.runners.GenericProgramRunner;
2124
import com.intellij.execution.ui.RunContentDescriptor;
@@ -47,6 +50,7 @@
4750
import io.flutter.settings.FlutterSettings;
4851
import io.flutter.utils.JsonUtils;
4952
import io.flutter.utils.OpenApiUtils;
53+
import io.flutter.utils.ProcessAdapter;
5054
import io.flutter.utils.StdoutJsonParser;
5155
import io.flutter.utils.UrlUtils;
5256
import org.jetbrains.annotations.NotNull;

src/io/flutter/run/test/FlutterTestRunner.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
import com.intellij.execution.configurations.RunProfile;
1515
import com.intellij.execution.configurations.RunProfileState;
1616
import com.intellij.execution.executors.DefaultDebugExecutor;
17-
import com.intellij.execution.process.*;
17+
import com.intellij.execution.process.ProcessEvent;
18+
import com.intellij.execution.process.ProcessHandler;
19+
import com.intellij.execution.process.ProcessListener;
20+
import com.intellij.execution.process.ProcessOutputTypes;
1821
import com.intellij.execution.runners.ExecutionEnvironment;
1922
import com.intellij.execution.runners.GenericProgramRunner;
2023
import com.intellij.execution.runners.RunContentBuilder;
@@ -37,6 +40,7 @@
3740
import io.flutter.sdk.FlutterSdk;
3841
import io.flutter.settings.FlutterSettings;
3942
import io.flutter.utils.JsonUtils;
43+
import io.flutter.utils.ProcessAdapter;
4044
import io.flutter.utils.StdoutJsonParser;
4145
import io.flutter.utils.VmServiceListenerAdapter;
4246
import io.flutter.vmService.VmServiceConsumers;
@@ -332,7 +336,8 @@ private void dispatchJson(String json) {
332336

333337
if (primVmServiceUri != null) {
334338
observatoryUri = primVmServiceUri.getAsString();
335-
} else {
339+
}
340+
else {
336341
final JsonPrimitive primObservatoryUri = params.getAsJsonPrimitive("observatoryUri");
337342

338343
if (primObservatoryUri != null) {

src/io/flutter/sdk/FlutterCommand.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
import com.google.common.collect.ImmutableList;
99
import com.intellij.execution.ExecutionException;
1010
import com.intellij.execution.configurations.GeneralCommandLine;
11-
import com.intellij.execution.process.*;
11+
import com.intellij.execution.process.CapturingProcessAdapter;
12+
import com.intellij.execution.process.ColoredProcessHandler;
13+
import com.intellij.execution.process.ProcessEvent;
14+
import com.intellij.execution.process.ProcessListener;
15+
import com.intellij.execution.process.ProcessOutput;
1216
import com.intellij.openapi.diagnostic.Logger;
1317
import com.intellij.openapi.module.Module;
1418
import com.intellij.openapi.project.Project;
@@ -23,12 +27,17 @@
2327
import io.flutter.logging.PluginLogger;
2428
import io.flutter.settings.FlutterSettings;
2529
import io.flutter.utils.MostlySilentColoredProcessHandler;
30+
import io.flutter.utils.ProcessAdapter;
2631
import org.jetbrains.annotations.NotNull;
2732
import org.jetbrains.annotations.Nullable;
2833

2934
import java.nio.charset.StandardCharsets;
3035
import java.nio.file.Path;
31-
import java.util.*;
36+
import java.util.ArrayList;
37+
import java.util.Arrays;
38+
import java.util.HashSet;
39+
import java.util.List;
40+
import java.util.Set;
3241
import java.util.function.Consumer;
3342

3443
/**

src/io/flutter/sdk/FlutterSdk.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
import com.google.gson.JsonObject;
1010
import com.google.gson.JsonPrimitive;
1111
import com.google.gson.JsonSyntaxException;
12-
import com.intellij.execution.process.*;
12+
import com.intellij.execution.process.ColoredProcessHandler;
13+
import com.intellij.execution.process.ProcessEvent;
14+
import com.intellij.execution.process.ProcessListener;
15+
import com.intellij.execution.process.ProcessOutputTypes;
1316
import com.intellij.openapi.diagnostic.Logger;
1417
import com.intellij.openapi.fileEditor.FileDocumentManager;
1518
import com.intellij.openapi.module.Module;
@@ -41,6 +44,7 @@
4144
import io.flutter.run.test.TestFields;
4245
import io.flutter.settings.FlutterSettings;
4346
import io.flutter.utils.JsonUtils;
47+
import io.flutter.utils.ProcessAdapter;
4448
import org.jetbrains.annotations.NonNls;
4549
import org.jetbrains.annotations.NotNull;
4650
import org.jetbrains.annotations.Nullable;
@@ -49,7 +53,14 @@
4953
import java.nio.file.Files;
5054
import java.nio.file.Paths;
5155
import java.nio.file.attribute.FileTime;
52-
import java.util.*;
56+
import java.util.ArrayList;
57+
import java.util.Arrays;
58+
import java.util.HashMap;
59+
import java.util.HashSet;
60+
import java.util.List;
61+
import java.util.Map;
62+
import java.util.Objects;
63+
import java.util.Set;
5364

5465
import static java.util.Arrays.asList;
5566

@@ -431,7 +442,7 @@ public FlutterCommand widgetPreview(@NotNull PubRoot root, boolean isVerboseMode
431442
args.add("--devtools-server-address=" + devToolsUri);
432443
}
433444

434-
return new FlutterCommand(this, root.getRoot(), FlutterCommand.Type.WIDGET_PREVIEW, args.toArray(new String[]{}));
445+
return new FlutterCommand(this, root.getRoot(), FlutterCommand.Type.WIDGET_PREVIEW, args.toArray(new String[]{ }));
435446
}
436447

437448
/**

0 commit comments

Comments
 (0)