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

IDEA-200312 UI freeze during Search Everywhere

Browse Source
This commit is contained in:
Mikhail Sokolov
2018-10-17 20:05:55 +03:00
parent af98aeaafb
commit 2cbca17828
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
+2
View File
@@ -105,6 +105,7 @@ public class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiE
.orElse(null);
VirtualFile file = ((PsiFileSystemItem)element).getVirtualFile();
if (file != null) {
text = FileUtil.toSystemDependentName(text);
String filePath = FileUtil.toSystemDependentName(file.getPath());
if (basePath != null && FileUtil.isAncestor(basePath, filePath, true)) {
text = ObjectUtils.notNull(FileUtil.getRelativePath(basePath, text, File.separatorChar), text);
@@ -112,6 +113,7 @@ public class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiE
else {
String rootPath = Optional.ofNullable(GotoFileCellRenderer.getAnyRoot(file, project))
.map(root -> FileUtil.toSystemDependentName(root.getPath()))
.filter(root -> basePath != null && FileUtil.isAncestor(basePath, root, true))
.orElse(null);
text = rootPath != null
? ObjectUtils.notNull(FileUtil.getRelativePath(rootPath, text, File.separatorChar), text)