From 2cbca1782873532cf81d111188a549b355dca0d9 Mon Sep 17 00:00:00 2001
From: Mikhail Sokolov <mikhail.sokolov@jetbrains.com>
Date: Wed, 17 Oct 2018 20:01:13 +0300
Subject: [PATCH] IDEA-200312 UI freeze during Search Everywhere

---
 .../com/intellij/ide/actions/SearchEverywherePsiRenderer.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
index fb6b0543fa5f..1d2b397c1440 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
@@ -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)