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-128733 FindInPath: "Recursively" option with Directory Scope selected doesn't work

Browse Source
This commit is contained in:
peter
2014-08-25 20:11:30 +02:00
parent 2ade2e8051
commit bbe6815a5c
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
+22
View File
@@ -343,6 +343,28 @@ public class FindManagerTest extends DaemonAnalyzerTestCase {
assertSize(2, findUsages(findModel));
}
public void testNonRecursiveDirectory() throws Exception {
VirtualFile root = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(createTempDirectory());
addSourceContentToRoots(myModule, root);
VirtualFile foo = createChildDirectory(root, "foo");
VirtualFile bar = createChildDirectory(foo, "bar");
createFile(myModule, root, "A.txt", "goo doo");
createFile(myModule, foo, "A.txt", "goo doo");
createFile(myModule, bar, "A.txt", "doo goo");
FindModel findModel = FindManagerTestUtils.configureFindModel("done");
findModel.setProjectScope(false);
findModel.setDirectoryName(foo.getPath());
findModel.setStringToFind("doo");
findModel.setWithSubdirectories(true);
assertSize(2, findUsages(findModel));
findModel.setWithSubdirectories(false);
assertSize(1, findUsages(findModel));
}
public void testReplaceRegexp() {
FindModel findModel = new FindModel();
findModel.setStringToFind("bug_(?=here)");
platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
+1 -1
View File
@@ -421,7 +421,7 @@ class FindInProjectTask {
SearchScope customScope = myFindModel.getCustomScope();
GlobalSearchScope scope = myPsiDirectory != null
? GlobalSearchScopesCore.directoryScope(myPsiDirectory, true)
? GlobalSearchScopesCore.directoryScope(myPsiDirectory, myFindModel.isWithSubdirectories())
: myModule != null
? myModule.getModuleContentScope()
: customScope instanceof GlobalSearchScope