Skip to content

[CQ] migrate off deprecated loadCoverageData override #8381

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[CQ] migrate off deprecated loadCoverageData override #8381

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b93b1e3
[CQ] migrate off deprecated `loadCoverageData` override
pq Jul 28, 2025
9704c68
dedup
pq Jul 28, 2025
a5ab269
Merge branch 'master' into cq_dep_coverageRunner
pq Jul 28, 2025
5212914
Merge branch 'master' into cq_dep_coverageRunner
pq Aug 12, 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
21 changes: 14 additions & 7 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 @@ -6,8 +6,12 @@
package io.flutter.run.coverage;

import com.intellij.coverage.CoverageEngine;
import com.intellij.coverage.CoverageLoadErrorReporter;
import com.intellij.coverage.CoverageLoadingResult;
import com.intellij.coverage.CoverageRunner;
import com.intellij.coverage.CoverageSuite;
import com.intellij.coverage.FailedCoverageLoadingResult;
import com.intellij.coverage.SuccessCoverageLoadingResult;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.rt.coverage.data.ProjectData;
import io.flutter.FlutterBundle;
Expand All @@ -21,26 +25,29 @@ public class FlutterCoverageRunner extends CoverageRunner {
private static final String ID = "FlutterCoverageRunner";
private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageRunner.class.getName());

@Nullable
@Override
public ProjectData loadCoverageData(@NotNull final File sessionDataFile, @Nullable CoverageSuite baseCoverageSuite) {
public @NotNull CoverageLoadingResult loadCoverageData(@NotNull final File sessionDataFile,
@Nullable CoverageSuite baseCoverageSuite,
@NotNull CoverageLoadErrorReporter reporter) {
if (!(baseCoverageSuite instanceof FlutterCoverageSuite)) {
return null;
return new FailedCoverageLoadingResult("Flutter coverage suite is not a FlutterCoverageSuite");
}
return doLoadCoverageData(sessionDataFile, (FlutterCoverageSuite)baseCoverageSuite);
}

@Nullable
private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFile, @NotNull final FlutterCoverageSuite coverageSuite) {
private static @NotNull CoverageLoadingResult doLoadCoverageData(@NotNull final File sessionDataFile,
@NotNull final FlutterCoverageSuite coverageSuite) {
final ProjectData projectData = new ProjectData();
try {
LcovInfo.readInto(projectData, sessionDataFile);
}
catch (IOException ex) {
LOG.warn(FlutterBundle.message("coverage.data.not.read", sessionDataFile.getAbsolutePath()));
return null;
}
return projectData;
if (projectData == null) {
return new FailedCoverageLoadingResult("Flutter coverage data could not be read");
}
return new SuccessCoverageLoadingResult(projectData);
}

@NotNull
Expand Down
Loading