MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-163385 Switcher: File paths are displayed for all files in switcher

Browse Source 
GitOrigin-RevId: 7fbb7d0e6e32ce7abeab26e3b2f45756815fa603
This commit is contained in:
Vera Petrenkova
2024-10-04 10:17:27 +02:00
committed by intellij-monorepo-bot
parent 7e54e98375
commit 4d938c4776
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/platform-impl/src/com/intellij/ide/actions/Switcher.kt
View File

@@ -29,6 +29,7 @@ import com.intellij.openapi.components.service
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory
import com.intellij.openapi.fileEditor.impl.*
import com.intellij.openapi.fileEditor.impl.EditorTabPresentationUtil.getCustomEditorTabTitle
import com.intellij.openapi.keymap.KeymapUtil
import com.intellij.openapi.progress.blockingContext
import com.intellij.openapi.project.LightEditActionFactory
@@ -48,10 +49,11 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.newvfs.VfsPresentationUtil
import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.platform.ide.CoreUiCoroutineScopeHolder
import com.intellij.psi.search.FilenameIndex
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.ui.*
import com.intellij.ui.components.JBList
import com.intellij.ui.components.JBScrollPane
import com.intellij.ui.components.JBScrollPane.*
import com.intellij.ui.components.panels.HorizontalLayout
import com.intellij.ui.hover.ListHoverListener
import com.intellij.ui.popup.PopupUpdateProcessorBase
@@ -571,7 +573,11 @@ object Switcher : BaseSwitcherAction(null) {
ReadAction.nonBlocking<List<ListItemData>> {
items.map {
val parentPath = Path(it.file.presentableUrl).parent
val result = if (parentPath == null || parentPath.nameCount == 0) "" else {
val sameNameFiles = FilenameIndex.getVirtualFilesByName(it.file.name, GlobalSearchScope.projectScope(project))
val result = if (parentPath == null ||
parentPath.nameCount == 0 ||
sameNameFiles.size <= 1) ""
else {
val filePath = parentPath.pathString
val projectPath = project.basePath?.let { FileUtil.toSystemDependentName(it) }
if (projectPath != null && FileUtil.isAncestor(projectPath, filePath, true)) {
@@ -588,7 +594,7 @@ object Switcher : BaseSwitcherAction(null) {
}
ListItemData(item = it,
mainText = VfsPresentationUtil.getPresentableNameForUI(it.project, it.file),
mainText = getCustomEditorTabTitle(project, it.file) ?: it.mainText,
statusText = FileUtil.getLocationRelativeToUserHome((it.file.parent ?: it.file).presentableUrl),
pathText = result,
backgroundColor = VfsPresentationUtil.getFileBackgroundColor(it.project, it.file),