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

properly read fields of array type from java bytecode

Browse Source 
KT-1086
This commit is contained in:
Stepan Koltsov
2012-01-23 19:12:19 +04:00
parent ca6f04eb55
commit 45cc0cd99e
3 changed files with 25 additions and 8 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
+15 -8
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiArrayType;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiClassType;
import com.intellij.psi.PsiElement;
@@ -825,16 +826,22 @@ public class JavaDescriptorResolver {
} else if (typeSource.getTypeString().length() > 0) {
return typeSource.getTypeString();
} else {
if (typeSource.getPsiType() instanceof PsiClassType) {
return ((PsiClassType) typeSource.getPsiType()).getClassName();
} else if (typeSource.getPsiType() instanceof PsiPrimitiveType) {
return typeSource.getPsiType().getPresentableText();
} else {
throw new IllegalStateException("" + typeSource.getPsiType().getClass());
}
return psiTypeToKey(typeSource.getPsiType());
}
}
private Object psiTypeToKey(PsiType psiType) {
if (psiType instanceof PsiClassType) {
return ((PsiClassType) psiType).getClassName();
} else if (psiType instanceof PsiPrimitiveType) {
return psiType.getPresentableText();
} else if (psiType instanceof PsiArrayType) {
return Pair.create("[", psiTypeToKey(((PsiArrayType) psiType).getComponentType()));
} else {
throw new IllegalStateException("" + psiType.getClass());
}
}
private Object propertyKeyForGrouping(PropertyAccessorData propertyAccessor) {
Object type = key(propertyAccessor.getType());
Object receiverType = key(propertyAccessor.getReceiverType());