From be377e3ededd34758873dc0c72e10226362e9737 Mon Sep 17 00:00:00 2001 From: Mikhail Sokolov Date: Tue, 30 Jun 2020 13:52:52 +0300 Subject: [PATCH] IDEA-227412 Function "Navigate -> File" does not show folder path in status bar while it shows for files GitOrigin-RevId: 9a87bc8bc53fbb389db8c7780d587db9bfc12ddb --- .../searcheverywhere/FileSearchEverywhereContributor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java index ee8b490dd82f..d241d08456d2 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/FileSearchEverywhereContributor.java @@ -12,6 +12,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileSystemItem; import com.intellij.ui.IdeUICustomization; @@ -112,8 +113,9 @@ public class FileSearchEverywhereContributor extends AbstractGotoSEContributor { return element; } - if (SearchEverywhereDataKeys.ITEM_STRING_DESCRIPTION.is(dataId) && element instanceof PsiFile) { - String path = ((PsiFile)element).getVirtualFile().getPath(); + if (SearchEverywhereDataKeys.ITEM_STRING_DESCRIPTION.is(dataId) + && (element instanceof PsiFile || element instanceof PsiDirectory)) { + String path = ((PsiFileSystemItem)element).getVirtualFile().getPath(); path = FileUtil.toSystemIndependentName(path); if (myProject != null) { String basePath = myProject.getBasePath();