Skip to content

[logging] Use plugin logger for test coverage files #8516

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
helin24 merged 2 commits into from
Sep 5, 2025
Merged

[logging] Use plugin logger for test coverage files #8516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6405ff
Use PluginLogger for coverage
helin24 Sep 5, 2025
79b8f61
Remove testing logs
helin24 Sep 5, 2025
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
17 changes: 15 additions & 2 deletions src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import io.flutter.FlutterBundle;
import io.flutter.logging.PluginLogger;
import io.flutter.run.test.TestConfig;
import io.flutter.settings.FlutterSettings;
import io.flutter.utils.OpenApiUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
Expand All @@ -33,9 +35,10 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Objects;

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

private static final String ID = "FlutterCoverageProgramRunner";
private ProcessHandler handler;
Expand Down Expand Up @@ -98,7 +101,17 @@ private void processCoverage(ExecutionEnvironment env) {
}
}
else {
LOG.error(FlutterBundle.message("coverage.path.not.found", path));
LOG.error(FlutterBundle.message("coverage.path.not.found", getSafePath(path)));
}
}

private @NotNull String getSafePath(@NotNull Path path) {
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
return path.toString();
}

if (path.getNameCount() == 0) return "";

return Objects.requireNonNull(path.getFileName()).toString();
}
}
8 changes: 6 additions & 2 deletions src/io/flutter/run/coverage/FlutterCoverageRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.rt.coverage.data.ProjectData;
import io.flutter.FlutterBundle;
import io.flutter.logging.PluginLogger;
import io.flutter.settings.FlutterSettings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand All @@ -19,7 +21,7 @@

public class FlutterCoverageRunner extends CoverageRunner {
private static final String ID = "FlutterCoverageRunner";
private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageRunner.class.getName());
private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterCoverageRunner.class);

@Nullable
@Override
Expand All @@ -37,7 +39,9 @@ private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFil
LcovInfo.readInto(projectData, sessionDataFile);
}
catch (IOException ex) {
LOG.warn(FlutterBundle.message("coverage.data.not.read", sessionDataFile.getAbsolutePath()));
LOG.warn(FlutterBundle.message("coverage.data.not.read", FlutterSettings.getInstance().isFilePathLoggingEnabled()
? sessionDataFile.getAbsolutePath()
: sessionDataFile.getName()));
return null;
}
return projectData;
Expand Down