From 6bd2b93aeb911e2b68271fc7686bc76bdd748b5f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 21 Aug 2017 19:24:31 +0200
Subject: [PATCH] Cleanup (minor optimization; formatting)

---
 .../openapi/project/ProjectUtilCore.kt        | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 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 613f84a660d3..c7a34a93a634 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
+++ b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
@@ -25,40 +25,33 @@ import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.LocalFileProvider
 import com.intellij.openapi.vfs.VirtualFile
 
-fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project, includeFilePath: Boolean, keepModuleAlwaysOnTheLeft: Boolean): String {
+fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project, includeFilePath: Boolean, moduleOnTheLeft: Boolean): String {
   var result = url
-  val baseDir = project.baseDir
-  if (baseDir != null && includeFilePath) {
-    val projectHomeUrl = baseDir.presentableUrl
-    if (result.startsWith(projectHomeUrl)) {
+
+  if (includeFilePath) {
+    val projectHomeUrl = project.baseDir?.presentableUrl
+    if (projectHomeUrl != null && result.startsWith(projectHomeUrl)) {
       result = "...${result.substring(projectHomeUrl.length)}"
     }
   }
 
   if (SystemInfo.isMac && file.fileSystem is LocalFileProvider) {
-    val fileForJar = (file.fileSystem as LocalFileProvider).getLocalVirtualFileFor(file)
-    if (fileForJar != null) {
+    val localFile = (file.fileSystem as LocalFileProvider).getLocalVirtualFileFor(file)
+    if (localFile != null) {
       val libraryEntry = LibraryUtil.findLibraryEntry(file, project)
-      if (libraryEntry != null) {
-        if (libraryEntry is JdkOrderEntry) {
-          result = "$result - [${libraryEntry.jdkName}]"
-        }
-        else {
-          result = "$result - [${libraryEntry.presentableName}]"
-        }
-      }
-      else {
-        result = "$result - [${fileForJar.name}]"
+      result = when {
+        libraryEntry is JdkOrderEntry -> "$result - [${libraryEntry.jdkName}]"
+        libraryEntry != null -> "$result - [${libraryEntry.presentableName}]"
+        else -> "$result - [${localFile.name}]"
       }
     }
   }
 
-  val module = ModuleUtilCore.findModuleForFile(file, project) ?: return result
-  return if (!keepModuleAlwaysOnTheLeft && SystemInfo.isMac) {
-    "$result - [${module.name}]"
-  }
-  else {
-    "[${module.name}] - $result"
+  val module = ModuleUtilCore.findModuleForFile(file, project)
+  return when {
+    module == null -> result
+    !moduleOnTheLeft && SystemInfo.isMac -> "$result - [${module.name}]"
+    else -> "[${module.name}] - $result"
   }
 }
 
@@ -68,6 +61,7 @@ interface ProjectFileStoreOptionManager {
 
 val Project.isExternalStorageEnabled: Boolean
   get() {
-    val manager = picoContainer.getComponentInstance("com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager") as? ProjectFileStoreOptionManager ?: return false
+    val key = "com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager"
+    val manager = picoContainer.getComponentInstance(key) as? ProjectFileStoreOptionManager ?: return false
     return manager.isStoredExternally || Registry.`is`("store.imported.project.elements.separately", false) || IS_EXTERNAL_STORAGE_ENABLED
   }
\ No newline at end of file