From 122f7ddbe2812b5163327945c472ef21f2dcfea8 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 25 Jun 2015 17:27:57 +0200 Subject: [PATCH] IDEA-141160 Indexing prevents "Find in Path" --- .../testSrc/com/intellij/find/FindManagerTest.java | 14 ++++++++++++++ .../src/com/intellij/find/impl/FindDialog.java | 6 ------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java index d28bd8294614..883a413323fc 100644 --- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java @@ -29,6 +29,7 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.PlainTextFileType; +import com.intellij.openapi.project.DumbServiceImpl; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.ProperTextRange; import com.intellij.openapi.util.io.FileUtil; @@ -747,4 +748,17 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { FindUtil.replace(myProject, myEditor, 0, model); assertEquals("soMething\telse", myEditor.getDocument().getText()); } + + public void testSearchInDumbMode() throws Exception { + createFile("a.java", "foo bar foo true"); + FindModel findModel = FindManagerTestUtils.configureFindModel("true"); + findModel.setWholeWordsOnly(true); + DumbServiceImpl.getInstance(getProject()).setDumb(true); + try { + assertSize(1, findUsages(findModel)); + } + finally { + DumbServiceImpl.getInstance(getProject()).setDumb(false); + } + } } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index 1d68bb989699..9946b3795e47 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -44,7 +44,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressIndicatorBase; import com.intellij.openapi.progress.util.ProgressIndicatorUtils; import com.intellij.openapi.progress.util.ReadTask; -import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.*; import com.intellij.openapi.util.Disposer; @@ -670,11 +669,6 @@ public class FindDialog extends DialogWrapper { } private void doOKAction(boolean findAll) { - if (DumbService.isDumb(myProject)) { - Messages.showMessageDialog(myProject, "Find in Path is not available while indexing is in progress", "Indexing", null); - return; - } - if (myResultsPreviewTable != null && myContent.getSelectedIndex() == RESULTS_PREVIEW_TAB_INDEX && myResultsPreviewTable.getSelectedRowCount() != 0 &&