From c81e91d66c665ae8ade20b8a710395a02f55d9dc Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 7 May 2012 10:57:25 +0200 Subject: [PATCH] respect SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES option --- .../platform-impl/src/com/intellij/ide/actions/Switcher.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index e7d11d2ced32..325ff23bebb2 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -942,7 +942,9 @@ public class Switcher extends AnAction implements DumbAware { protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof FileInfo) { VirtualFile virtualFile = ((FileInfo)value).getFirst(); - String name = UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(myProject, virtualFile); + String name = UISettings.getInstance().SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES + ? UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(myProject, virtualFile) + : virtualFile.getName(); setIcon(IconUtil.getIcon(virtualFile, Iconable.ICON_FLAG_READ_STATUS, myProject)); FileStatus fileStatus = FileStatusManager.getInstance(myProject).getStatus(virtualFile);