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

find dialog/popup: show unique path for files

Browse Source
This commit is contained in:
Sergey Ignatov
2016-06-27 02:30:59 +03:00
parent b07a052461
commit 7d25eaca69
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindDialog.java
+9 -1
View File
@@ -37,6 +37,7 @@ import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.fileChooser.FileChooser;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileEditor.UniqueVFilePathBuilder;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.PlainTextFileType;
@@ -1669,7 +1670,7 @@ public class FindDialog extends DialogWrapper {
TextChunk[] text = usageAdapter.getPresentation().getText();
// line number / file info
VirtualFile file = usageAdapter.getFile();
String uniqueVirtualFilePath = myOmitFileExtension ? file.getNameWithoutExtension() : file.getName();
String uniqueVirtualFilePath = getFilePath(usageAdapter);
VirtualFile prevFile = findPrevFile(table, row, column);
SimpleTextAttributes attributes = Comparing.equal(file, prevFile) ? REPEATED_FILE_ATTRIBUTES : ORDINAL_ATTRIBUTES;
append(uniqueVirtualFilePath, attributes);
@@ -1678,6 +1679,13 @@ public class FindDialog extends DialogWrapper {
setBorder(null);
}
@NotNull
private String getFilePath(@NotNull UsageInfo2UsageAdapter ua) {
String uniquePath =
UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(ua.getUsageInfo().getProject(), ua.getFile());
return myOmitFileExtension ? StringUtil.trimExtension(uniquePath) : uniquePath;
}
@Nullable
private VirtualFile findPrevFile(@NotNull JTable table, int row, int column) {
if (row <= 0) return null;