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

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-11-20 11:21:02 +01:00
parent 0b0ef505d3
commit 00dcb5ade5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-api/src/com/intellij/openapi/project/ProjectUtilCore.kt
+8 -5
View File
@@ -11,13 +11,14 @@ import com.intellij.openapi.roots.libraries.LibraryUtil
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.LocalFileProvider
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.PathUtil
import com.intellij.util.PlatformUtils
fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project, includeFilePath: Boolean, moduleOnTheLeft: Boolean): String {
fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project, isIncludeFilePath: Boolean, moduleOnTheLeft: Boolean): String {
var result = url
if (includeFilePath) {
val projectHomeUrl = project.baseDir?.presentableUrl
if (isIncludeFilePath) {
val projectHomeUrl = PathUtil.toSystemDependentName(project.basePath)
result = when {
projectHomeUrl != null && result.startsWith(projectHomeUrl) -> "...${result.substring(projectHomeUrl.length)}"
else -> FileUtil.getLocationRelativeToUserHome(file.presentableUrl)
@@ -35,8 +36,10 @@ fun displayUrlRelativeToProject(file: VirtualFile, url: String, project: Project
}
}
if (PlatformUtils.isCidr() || PlatformUtils.isRider()) // see PredefinedSearchScopeProviderImpl.getPredefinedScopes for the other place to fix.
// see PredefinedSearchScopeProviderImpl.getPredefinedScopes for the other place to fix.
if (PlatformUtils.isCidr() || PlatformUtils.isRider()) {
return result
}
val module = ModuleUtilCore.findModuleForFile(file, project)
return when {
@@ -53,5 +56,5 @@ val Project.isExternalStorageEnabled: Boolean
}
val manager = ServiceManager.getService(this, ExternalStorageConfigurationManager::class.java) ?: return false
return manager.isEnabled() || (ApplicationManager.getApplication()?.isUnitTestMode ?: false)
return manager.isEnabled || (ApplicationManager.getApplication()?.isUnitTestMode ?: false)
}