MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (minor optimization; formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-08-21 19:53:36 +02:00
parent 1cb16f2614
commit 6bd2b93aeb
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
+18 -24
View File
@@ -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
}