azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make AltClassFinder parameterized

Browse Source 
(class will be reused to find builtins)
This commit is contained in:
Stepan Koltsov
2012-04-07 06:32:17 +04:00
parent 3b7b492a0b
commit 9b120184f5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java
+2 -2
View File
@@ -24,12 +24,12 @@ import com.intellij.psi.PsiPackage;
import com.intellij.psi.impl.compiled.ClsClassImpl; import com.intellij.psi.impl.compiled.ClsClassImpl;
import com.intellij.psi.search.DelegatingGlobalSearchScope; import com.intellij.psi.search.DelegatingGlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.FqName;
import org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder; import org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.utils.PathUtil;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
@@ -51,7 +51,7 @@ public class PsiClassFinderForJvm implements PsiClassFinder {
@PostConstruct @PostConstruct
public void initialize() { public void initialize() {
this.altClassFinder = new AltClassFinder(project); this.altClassFinder = new AltClassFinder(project, PathUtil.getAltHeadersRoots());
this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) { this.javaSearchScope = new DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) {
@Override @Override
public boolean contains(VirtualFile file) { public boolean contains(VirtualFile file) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/alt/AltClassFinder.java
+3 -3
View File
@@ -26,18 +26,18 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.FqName;
import org.jetbrains.jet.utils.PathUtil;
import java.util.List; import java.util.List;
// TODO: rename
public class AltClassFinder { public class AltClassFinder {
private final PsiManager psiManager; private final PsiManager psiManager;
private final List<VirtualFile> roots; private final List<VirtualFile> roots;
public AltClassFinder(Project project) { public AltClassFinder(Project project, @NotNull List<VirtualFile> roots) {
psiManager = PsiManager.getInstance(project); psiManager = PsiManager.getInstance(project);
this.roots = PathUtil.getAltHeadersRoots(); this.roots = roots;
} }
public PsiClass findClass(@NotNull FqName qualifiedName) { public PsiClass findClass(@NotNull FqName qualifiedName) {