Minor, extract MessageUtil.virtualFileToPath

compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java

@@ -43,18 +43,17 @@ public class MessageUtil {
             @Nullable String defaultValue,
             @NotNull DiagnosticUtils.LineAndColumn lineAndColumn
     ) {
-        String path;
         VirtualFile virtualFile = file.getVirtualFile();
-        if (virtualFile == null) {
+        String path = virtualFile != null ? virtualFileToPath(virtualFile) : defaultValue;
-            path = defaultValue;
-        }
-        else {
-            path = virtualFile.getPath();
-            // Convert path to platform-dependent format when virtualFile is local file.
-            if (virtualFile instanceof CoreLocalVirtualFile || virtualFile instanceof CoreJarVirtualFile) {
-                path = toSystemDependentName(path);
-            }
-        }
         return CompilerMessageLocation.create(path, lineAndColumn.getLine(), lineAndColumn.getColumn(), lineAndColumn.getLineContent());
     }
+
+    @NotNull
+    public static String virtualFileToPath(@NotNull VirtualFile virtualFile) {
+        // Convert path to platform-dependent format when virtualFile is local file.
+        if (virtualFile instanceof CoreLocalVirtualFile || virtualFile instanceof CoreJarVirtualFile) {
+            return toSystemDependentName(virtualFile.getPath());
+        }
+        return virtualFile.getPath();
+    }
 }

compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java

@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants;
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport;
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity;
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
+import org.jetbrains.kotlin.cli.common.messages.MessageUtil;
 import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -266,9 +267,9 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
         Iterable<String> fileNames = CollectionsKt.map(sourceFiles, file -> {
             VirtualFile virtualFile = file.getVirtualFile();
             if (virtualFile != null) {
-                return FileUtil.toSystemDependentName(virtualFile.getPath());
+                return MessageUtil.virtualFileToPath(virtualFile);
             }
-            return file.getName() + "(no virtual file)";
+            return file.getName() + " (no virtual file)";
         });
         messageCollector.report(LOGGING, "Compiling source files: " + StringsKt.join(fileNames, ", "), null);
     }