From 308a757364f31d9ab17d704f0bb066433e30467d Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 21 Aug 2017 19:50:30 +0200 Subject: [PATCH] [ui] consistent results of ProjectUtilCore.displayUrlRelativeToProject() --- .../src/com/intellij/openapi/project/ProjectUtilCore.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt index b333d25540ea..7d62d9e55cb8 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt +++ b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt @@ -20,7 +20,6 @@ import com.intellij.configurationStore.IS_EXTERNAL_STORAGE_ENABLED import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.roots.libraries.LibraryUtil -import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vfs.LocalFileProvider import com.intellij.openapi.vfs.VirtualFile @@ -35,7 +34,7 @@ fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project } } - if (SystemInfo.isMac && file.fileSystem is LocalFileProvider) { + if (file.fileSystem is LocalFileProvider) { @Suppress("DEPRECATION") val localFile = (file.fileSystem as LocalFileProvider).getLocalVirtualFileFor(file) if (localFile != null) { val libraryEntry = LibraryUtil.findLibraryEntry(file, project) @@ -50,8 +49,8 @@ fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project val module = ModuleUtilCore.findModuleForFile(file, project) return when { module == null -> result - !moduleOnTheLeft && SystemInfo.isMac -> "$result - [${module.name}]" - else -> "[${module.name}] - $result" + moduleOnTheLeft -> "[${module.name}] - $result" + else -> "$result - [${module.name}]" } }