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

ReadClassDataTest, working on generics

Browse Source
This commit is contained in:
Stepan Koltsov
2011-12-21 22:28:23 +04:00
parent fea25e629f
commit a50067f6cf
5 changed files with 269 additions and 232 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
+2 -2
View File
@@ -662,7 +662,7 @@ public class JavaDescriptorResolver {
}
JetType outType;
if (typeFromAnnotation != null) {
if (typeFromAnnotation != null && typeFromAnnotation.length() > 0) {
outType = semanticServices.getTypeTransformer().transformToType(typeFromAnnotation);
} else {
outType = semanticServices.getTypeTransformer().transformToType(psiType);
@@ -858,7 +858,7 @@ public class JavaDescriptorResolver {
}
}
JetType transformedType;
if (returnTypeFromAnnotation != null) {
if (returnTypeFromAnnotation != null && returnTypeFromAnnotation.length() > 0) {
transformedType = semanticServices.getTypeTransformer().transformToType(returnTypeFromAnnotation);
} else {
transformedType = semanticServices.getTypeTransformer().transformToType(returnType);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java
+6
View File
@@ -131,6 +131,12 @@ public abstract class JetTypeJetSignatureReader extends JetSignatureExceptionsAd
};
}
@Override
public void visitTypeVariable(String name, boolean nullable) {
// TODO: need a way to get type TypeParameterDescriptor by name
throw new IllegalStateException();
}
@Override
public void visitEnd() {
JetType jetType = new JetTypeImpl(