Commit 7efc188b authored by Yaroslav Pankratyev's avatar Yaroslav Pankratyev
Browse files

IDEA-168449 Change search scope for plugin descriptors

parent 8eaddd30
Showing with 9 additions and 1 deletion
+9 -1
......@@ -353,6 +353,9 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
return filesWithLibrariesScope(project, files, false);
}
/**
* @since 2017.3
*/
@NotNull
public static GlobalSearchScope filesWithLibrariesScope(@NotNull Project project, @NotNull Collection<VirtualFile> files,
boolean searchOutsideRootModel) {
......
......@@ -16,8 +16,10 @@
package org.jetbrains.idea.devkit.util;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.impl.LibraryScopeCache;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopesCore;
import com.intellij.util.xml.DomService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.dom.IdeaPlugin;
......@@ -30,8 +32,11 @@ class PluginRelatedLocatorsUtils {
@NotNull
static GlobalSearchScope getCandidatesScope(@NotNull Project project) {
GlobalSearchScope scope = GlobalSearchScopesCore.projectProductionScope(project)
.uniteWith(LibraryScopeCache.getInstance(project).getLibrariesOnlyScope());
Collection<VirtualFile> candidates = DomService.getInstance()
.getDomFileCandidates(IdeaPlugin.class, project, GlobalSearchScope.allScope(project));
.getDomFileCandidates(IdeaPlugin.class, project, scope);
return GlobalSearchScope.filesWithLibrariesScope(project, candidates, true);
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment