Make sure alt-headers actually work in "core" environment
This commit is contained in:
+3
-13
@@ -6,7 +6,6 @@ package org.jetbrains.jet.lang.resolve.java.alt;
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.openapi.vfs.VirtualFileManager;
|
||||
import com.intellij.psi.PsiClass;
|
||||
import com.intellij.psi.PsiClassOwner;
|
||||
import com.intellij.psi.PsiFile;
|
||||
@@ -14,27 +13,18 @@ import com.intellij.psi.PsiManager;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.plugin.compiler.PathUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class AltClassFinder {
|
||||
private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.lang.resolve.java.alt.AltClassFinder");
|
||||
|
||||
private final PsiManager psiManager;
|
||||
private final List<VirtualFile> roots = new ArrayList<VirtualFile>();
|
||||
private final List<VirtualFile> roots;
|
||||
|
||||
|
||||
public AltClassFinder(Project project) {
|
||||
psiManager = PsiManager.getInstance(project);
|
||||
|
||||
File alts = PathUtil.getAltHeadersPath();
|
||||
|
||||
if (alts != null) {
|
||||
for (File root : alts.listFiles()) {
|
||||
VirtualFile jarRoot = VirtualFileManager.getInstance().findFileByUrl("jar://" + root.getPath() + "!/");
|
||||
roots.add(jarRoot);
|
||||
}
|
||||
}
|
||||
this.roots = PathUtil.getAltHeadersRoots();
|
||||
}
|
||||
|
||||
public PsiClass findClass(@NotNull String qualifiedName) {
|
||||
|
||||
Reference in New Issue
Block a user