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

Foo.class never yields null in Java annotation arguments

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-14 16:35:17 +04:00
parent 84709ed363
commit b120a5150c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+1 -1
View File
@@ -8,7 +8,7 @@ public open class ClassObjectArrayInParam : java.lang.Object {
public abstract fun value(): jet.Array<java.lang.Class<out jet.Any?>> public abstract fun value(): jet.Array<java.lang.Class<out jet.Any?>>
} }
test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam?.class, test.ClassObjectArrayInParam.Nested?.class, jet.String?.class}: jet.Array<java.lang.Class<out jet.Any?>>) public open class Nested : java.lang.Object { test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, jet.String.class}: jet.Array<java.lang.Class<out jet.Any?>>) public open class Nested : java.lang.Object {
public constructor Nested() public constructor Nested()
} }
} }
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+1 -1
View File
@@ -8,7 +8,7 @@ public open class ClassObjectInParam : java.lang.Object {
public abstract fun value(): java.lang.Class<out jet.Any?> public abstract fun value(): java.lang.Class<out jet.Any?>
} }
test.ClassObjectInParam.Anno(value = test.ClassObjectInParam?.class: java.lang.Class<test.ClassObjectInParam?>) public open class Nested : java.lang.Object { test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested : java.lang.Object {
public constructor Nested() public constructor Nested()
} }
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java
+3 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.JetTypeImpl; import org.jetbrains.jet.lang.types.JetTypeImpl;
import org.jetbrains.jet.lang.types.TypeProjectionImpl; import org.jetbrains.jet.lang.types.TypeProjectionImpl;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import javax.inject.Inject; import javax.inject.Inject;
@@ -147,7 +148,8 @@ public final class JavaAnnotationArgumentResolver {
@Nullable @Nullable
private CompileTimeConstant<?> resolveFromJavaClassObjectType(@NotNull JavaType javaType) { private CompileTimeConstant<?> resolveFromJavaClassObjectType(@NotNull JavaType javaType) {
JetType type = typeTransformer.transformToType(javaType, TypeVariableResolver.EMPTY); // Foo.class is never nullable
JetType type = TypeUtils.makeNotNullable(typeTransformer.transformToType(javaType, TypeVariableResolver.EMPTY));
ClassDescriptor jlClass = classResolver.resolveClass(JL_CLASS_FQ_NAME, IGNORE_KOTLIN_SOURCES); ClassDescriptor jlClass = classResolver.resolveClass(JL_CLASS_FQ_NAME, IGNORE_KOTLIN_SOURCES);
if (jlClass == null) return null; if (jlClass == null) return null;