From 58fc0efa65e09c157095d5263baf632787013b97 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 3 Oct 2017 22:07:18 +0300 Subject: [PATCH] structural search: resolve elements from idea open api inside groovy script (resolve and very basic completion now works) (follow up) --- .../intellij/structuralsearch/IdeaOpenApiClassFinder.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/IdeaOpenApiClassFinder.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/IdeaOpenApiClassFinder.java index c19793b809c9..f952ac5bb23e 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/IdeaOpenApiClassFinder.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/IdeaOpenApiClassFinder.java @@ -8,6 +8,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.NonClasspathClassFinder; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiPackage; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.structuralsearch.plugin.util.StructuralSearchScriptScope; import org.jetbrains.annotations.NotNull; @@ -38,4 +39,10 @@ public class IdeaOpenApiClassFinder extends NonClasspathClassFinder { public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { return !(scope instanceof StructuralSearchScriptScope) ? null : super.findClass(qualifiedName, scope); } + + @NotNull + @Override + public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { + return !(scope instanceof StructuralSearchScriptScope) ? PsiPackage.EMPTY_ARRAY : super.getSubPackages(psiPackage, scope); + } }