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

Proper alt class -> sources navigation“

Browse Source
This commit is contained in:
Maxim Shafirov
2012-01-31 18:55:49 +04:00
parent a31027d2d3
commit 59c6bd184d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+10 -2
View File
@@ -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 {
} }
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) {