Use PluginLogger for coverage

Author: helin24

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

@@ -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;
@@ -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;
@@ -96,9 +99,20 @@ private void processCoverage(ExecutionEnvironment env) {
         handler = null;
         listener = null;
       }
+      LOG.error(FlutterBundle.message("coverage.path.not.found", "test_" + getSafePath(path)));
     }
     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();
+  }
 }

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

@@ -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;
 
@@ -19,7 +21,8 @@
 
 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);
+  private static @NotNull Logger log;
 
   @Nullable
   @Override
@@ -35,9 +38,15 @@ private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFil
     final ProjectData projectData = new ProjectData();
     try {
       LcovInfo.readInto(projectData, sessionDataFile);
+      log.warn(FlutterBundle.message("coverage.data.not.read", "test_" + (FlutterSettings.getInstance().isFilePathLoggingEnabled()
+                                                               ? sessionDataFile.getAbsolutePath()
+                                                               : sessionDataFile.getName())));
+
     }
     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;