diff options
author | Ben Gruver <bgruv@google.com> | 2017-03-21 23:26:06 -0700 |
---|---|---|
committer | Ben Gruver <bgruv@google.com> | 2017-03-21 23:26:06 -0700 |
commit | 8ed2f186011a4d62767681d05c5f1e58a251b110 (patch) | |
tree | aa51d0068b96133bcc906f5fbbb292b3c48ca6d6 | |
parent | a15fc84ace690365ad55b66c98b27ffa7c35f1e6 (diff) | |
download | smali-8ed2f186011a4d62767681d05c5f1e58a251b110.tar.gz |
Add Project argument to SmaliClassFinder constructor
In some cases, scope.getProject() may be null. Apparently, IDEA will
automatically pass in the project if you specify one in the constructor.
See, e.g. MigrationElementFinder in the IDEA source.
-rw-r--r-- | smalidea/src/main/java/org/jf/smalidea/psi/index/SmaliClassFinder.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/index/SmaliClassFinder.java b/smalidea/src/main/java/org/jf/smalidea/psi/index/SmaliClassFinder.java index 0ebb1eec..87b2afff 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/index/SmaliClassFinder.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/index/SmaliClassFinder.java @@ -31,6 +31,7 @@ package org.jf.smalidea.psi.index; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElementFinder; import com.intellij.psi.search.GlobalSearchScope; @@ -40,9 +41,16 @@ import org.jf.smalidea.psi.impl.SmaliClass; import java.util.Collection; public class SmaliClassFinder extends PsiElementFinder { + + private final Project project; + + public SmaliClassFinder(Project project) { + this.project = project; + } + @Override public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { - Collection<SmaliClass> classes = SmaliClassNameIndex.INSTANCE.get(qualifiedName, scope.getProject(), scope); + Collection<SmaliClass> classes = SmaliClassNameIndex.INSTANCE.get(qualifiedName, project, scope); if (classes != null && classes.size() == 1) { return classes.iterator().next(); } |