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

directory scopes shouldn't assume they're always inside project (IDEA-181135)

Browse Source
This commit is contained in:
peter
2017-10-25 12:30:06 +02:00
parent 20d76b1580
commit 4c754d31eb
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java
+2 -2
View File
@@ -248,7 +248,7 @@ public class GlobalSearchScopesCore {
@Override
public boolean isSearchInLibraries() {
return false;
return true;
}
@Override
@@ -346,7 +346,7 @@ public class GlobalSearchScopesCore {
@Override
public boolean isSearchInLibraries() {
return false;
return true;
}
@Override
platform/platform-tests/testSrc/com/intellij/psi/search/GlobalSearchScopeTest.java
+13
View File
@@ -18,6 +18,7 @@ package com.intellij.psi.search;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.TempFiles;
import org.jetbrains.annotations.NotNull;
@@ -107,4 +108,16 @@ public class GlobalSearchScopeTest extends PlatformTestCase {
assertFalse(GlobalSearchScope.fileScope(myProject, file1).intersectWith(trueIntersection).contains(file2));
assertEquals(1, targetCalled.get());
}
public void testDirScopeSearchInLibraries() throws IOException {
VirtualFile libRoot = getVirtualFile(createTempDir("libRoot"));
VirtualFile contentRoot = getVirtualFile(createTempDir("contentRoot"));
PsiTestUtil.removeAllRoots(getModule(), null);
PsiTestUtil.addContentRoot(getModule(), contentRoot);
PsiTestUtil.addLibrary(getModule(), libRoot.getPath());
assertTrue(GlobalSearchScopes.directoryScope(myProject, libRoot, true).isSearchInLibraries());
assertTrue(GlobalSearchScopes.directoriesScope(myProject, true, libRoot, contentRoot).isSearchInLibraries());
}
}