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

Correct finder implementation for inner classes

Browse Source
This commit is contained in:
Maxim Shafirov
2012-01-31 15:50:51 +04:00
parent b9ab6d1af2
commit 379e066dac
1 changed files with 48 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/alt/AltClassFinder.java
+48 -2
View File
@@ -29,17 +29,63 @@ public class AltClassFinder {
public PsiClass findClass(@NotNull String qualifiedName) {
for (final VirtualFile classRoot : roots) {
final VirtualFile classFile = classRoot.findFileByRelativePath(qualifiedName.replace('.', '/') + ".class");
String pathRest = qualifiedName;
VirtualFile cur = classRoot;
while (true) {
int dot = pathRest.indexOf('.');
if (dot < 0) break;
String pathComponent = pathRest.substring(0, dot);
VirtualFile child = cur.findChild(pathComponent);
if (child == null) break;
pathRest = pathRest.substring(dot + 1);
cur = child;
}
String className = pathRest.replace('.', '$');
int bucks = className.indexOf('$');
String rootClassName;
if (bucks < 0) {
rootClassName = className;
}
else {
rootClassName = className.substring(0, bucks);
className = className.substring(bucks + 1);
}
final VirtualFile classFile = cur.findChild(rootClassName + ".class");
if (classFile != null) {
if (!classFile.isValid()) {
LOG.error("Invalid child of valid parent: " + classFile.getPath() + "; " + classRoot.isValid() + " path=" + classRoot.getPath());
return null;
}
final PsiFile file = psiManager.findFile(classFile);
if (file instanceof PsiClassOwner) {
final PsiClass[] classes = ((PsiClassOwner) file).getClasses();
if (classes.length == 1) {
return classes[0];
PsiClass curClass = classes[0];
if (bucks > 0) {
while (true) {
int b = className.indexOf("$");
String component = b < 0 ? className : className.substring(0, b);
PsiClass inner = curClass.findInnerClassByName(component, false);
if (inner == null) return null;
curClass = inner;
className = className.substring(b + 1);
if (b < 0) break;
}
}
return curClass;
}
}
}