Skip to content

Commit 559f9b1

Browse files
authored
[logging] Use plugin logger for test coverage files (#8516)
Part of #8369
1 parent 7518324 commit 559f9b1

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import com.intellij.openapi.vfs.LocalFileSystem;
2525
import com.intellij.openapi.vfs.VfsUtil;
2626
import io.flutter.FlutterBundle;
27+
import io.flutter.logging.PluginLogger;
2728
import io.flutter.run.test.TestConfig;
29+
import io.flutter.settings.FlutterSettings;
2830
import io.flutter.utils.OpenApiUtils;
2931
import org.jetbrains.annotations.NonNls;
3032
import org.jetbrains.annotations.NotNull;
@@ -33,9 +35,10 @@
3335
import java.nio.file.Files;
3436
import java.nio.file.Path;
3537
import java.nio.file.Paths;
38+
import java.util.Objects;
3639

3740
public class FlutterCoverageProgramRunner extends GenericProgramRunner<RunnerSettings> {
38-
private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageProgramRunner.class.getName());
41+
private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterCoverageProgramRunner.class);
3942

4043
private static final String ID = "FlutterCoverageProgramRunner";
4144
private ProcessHandler handler;
@@ -98,7 +101,17 @@ private void processCoverage(ExecutionEnvironment env) {
98101
}
99102
}
100103
else {
101-
LOG.error(FlutterBundle.message("coverage.path.not.found", path));
104+
LOG.error(FlutterBundle.message("coverage.path.not.found", getSafePath(path)));
102105
}
103106
}
107+
108+
private @NotNull String getSafePath(@NotNull Path path) {
109+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
110+
return path.toString();
111+
}
112+
113+
if (path.getNameCount() == 0) return "";
114+
115+
return Objects.requireNonNull(path.getFileName()).toString();
116+
}
104117
}

src/io/flutter/run/coverage/FlutterCoverageRunner.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import com.intellij.openapi.diagnostic.Logger;
1212
import com.intellij.rt.coverage.data.ProjectData;
1313
import io.flutter.FlutterBundle;
14+
import io.flutter.logging.PluginLogger;
15+
import io.flutter.settings.FlutterSettings;
1416
import org.jetbrains.annotations.NotNull;
1517
import org.jetbrains.annotations.Nullable;
1618

@@ -19,7 +21,7 @@
1921

2022
public class FlutterCoverageRunner extends CoverageRunner {
2123
private static final String ID = "FlutterCoverageRunner";
22-
private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageRunner.class.getName());
24+
private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterCoverageRunner.class);
2325

2426
@Nullable
2527
@Override
@@ -37,7 +39,9 @@ private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFil
3739
LcovInfo.readInto(projectData, sessionDataFile);
3840
}
3941
catch (IOException ex) {
40-
LOG.warn(FlutterBundle.message("coverage.data.not.read", sessionDataFile.getAbsolutePath()));
42+
LOG.warn(FlutterBundle.message("coverage.data.not.read", FlutterSettings.getInstance().isFilePathLoggingEnabled()
43+
? sessionDataFile.getAbsolutePath()
44+
: sessionDataFile.getName()));
4145
return null;
4246
}
4347
return projectData;

0 commit comments

Comments
 (0)