|
9 | 9 | import com.intellij.execution.Executor;
|
10 | 10 | import com.intellij.execution.configurations.CommandLineState;
|
11 | 11 | import com.intellij.execution.configurations.RuntimeConfigurationError;
|
| 12 | +import com.intellij.execution.filters.UrlFilter; |
12 | 13 | import com.intellij.execution.process.ProcessHandler;
|
13 | 14 | import com.intellij.execution.runners.ExecutionEnvironment;
|
14 | 15 | import com.intellij.execution.testframework.TestConsoleProperties;
|
|
20 | 21 | import com.intellij.execution.testframework.sm.runner.SMTestLocator;
|
21 | 22 | import com.intellij.execution.testframework.ui.BaseTestsOutputConsoleView;
|
22 | 23 | import com.intellij.execution.ui.ConsoleView;
|
| 24 | +import com.intellij.openapi.module.Module; |
| 25 | +import com.intellij.openapi.module.ModuleUtil; |
| 26 | +import com.intellij.openapi.project.Project; |
23 | 27 | import com.intellij.openapi.vfs.VirtualFile;
|
24 | 28 | import com.jetbrains.lang.dart.ide.runner.DartRelativePathsConsoleFilter;
|
25 |
| -import com.jetbrains.lang.dart.ide.runner.test.DartTestEventsConverter; |
26 | 29 | import com.jetbrains.lang.dart.ide.runner.util.DartTestLocationProvider;
|
27 | 30 | import com.jetbrains.lang.dart.util.DartUrlResolver;
|
| 31 | +import io.flutter.console.FlutterConsoleFilter; |
28 | 32 | import io.flutter.pub.PubRoot;
|
29 | 33 | import io.flutter.run.daemon.DaemonConsoleView;
|
30 | 34 | import io.flutter.run.daemon.RunMode;
|
@@ -97,11 +101,18 @@ protected ConsoleView createConsole(@NotNull Executor executor) throws Execution
|
97 | 101 | if (!testConsoleEnabled) {
|
98 | 102 | return super.createConsole(executor);
|
99 | 103 | }
|
| 104 | + |
100 | 105 | // Create a console showing a test tree.
|
101 |
| - final DartUrlResolver resolver = DartUrlResolver.getInstance(getEnvironment().getProject(), testFileOrDir); |
| 106 | + final Project project = getEnvironment().getProject(); |
| 107 | + final DartUrlResolver resolver = DartUrlResolver.getInstance(project, testFileOrDir); |
102 | 108 | final ConsoleProps props = new ConsoleProps(config, executor, resolver);
|
103 | 109 | final BaseTestsOutputConsoleView console = SMTestRunnerConnectionUtil.createConsole("FlutterTestRunner", props);
|
104 |
| - console.addMessageFilter(new DartRelativePathsConsoleFilter(config.getProject(), getBaseDir())); |
| 110 | + final Module module = ModuleUtil.findModuleForFile(testFileOrDir, project); |
| 111 | + if (module != null) { |
| 112 | + console.addMessageFilter(new FlutterConsoleFilter(module)); |
| 113 | + } |
| 114 | + console.addMessageFilter(new DartRelativePathsConsoleFilter(project, getBaseDir())); |
| 115 | + console.addMessageFilter(new UrlFilter()); |
105 | 116 | return console;
|
106 | 117 | }
|
107 | 118 |
|
|
0 commit comments