提交 59c6bd18 编写于 作者: M Maxim Shafirov

Proper alt class -> sources navigation“

上级 a31027d2
...@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project; ...@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*; import com.intellij.psi.*;
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 jet.typeinfo.TypeInfoVariance; import jet.typeinfo.TypeInfoVariance;
...@@ -647,9 +648,16 @@ public class JavaDescriptorResolver { ...@@ -647,9 +648,16 @@ public class JavaDescriptorResolver {
} }
public PsiClass findClass(String qualifiedName) { public PsiClass findClass(String qualifiedName) {
PsiClass original = javaFacade.findClass(qualifiedName, javaSearchScope);
PsiClass altClass = altClassFinder.findClass(qualifiedName); PsiClass altClass = altClassFinder.findClass(qualifiedName);
if (altClass != null) return altClass; if (altClass != null) {
return javaFacade.findClass(qualifiedName, javaSearchScope); if (altClass instanceof ClsClassImpl) {
altClass.putUserData(ClsClassImpl.DELEGATE_KEY, original);
}
return altClass;
}
return original;
} }
/*package*/ PsiPackage findPackage(String qualifiedName) { /*package*/ PsiPackage findPackage(String qualifiedName) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册