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

Flexible types for primitive arrays

Browse Source
This commit is contained in:
Andrey Breslav
2014-08-21 18:38:51 +04:00
parent 8134d097e3
commit 583694a450
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullIntArray { public open class NotNullIntArray {
public constructor NotNullIntArray() public constructor NotNullIntArray()
public open fun hi(): kotlin.IntArray public open fun hi(): kotlin.IntArray!
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
+5 -1
View File
@@ -59,7 +59,11 @@ class LazyJavaTypeResolver(
val javaComponentType = arrayType.getComponentType() val javaComponentType = arrayType.getComponentType()
if (javaComponentType is JavaPrimitiveType) { if (javaComponentType is JavaPrimitiveType) {
val jetType = JavaToKotlinClassMap.getInstance().mapPrimitiveKotlinClass("[" + javaComponentType.getCanonicalText()) val jetType = JavaToKotlinClassMap.getInstance().mapPrimitiveKotlinClass("[" + javaComponentType.getCanonicalText())
if (jetType != null) return TypeUtils.makeNullableAsSpecified(jetType, !attr.isMarkedNotNull) if (jetType != null) {
return if (PLATFORM_TYPES && attr.allowFlexible)
DelegatingFlexibleType(jetType, TypeUtils.makeNullable(jetType))
else TypeUtils.makeNullableAsSpecified(jetType, !attr.isMarkedNotNull)
}
} }
val projectionKind = if (attr.howThisTypeIsUsed == MEMBER_SIGNATURE_CONTRAVARIANT && !isVararg) OUT_VARIANCE else INVARIANT val projectionKind = if (attr.howThisTypeIsUsed == MEMBER_SIGNATURE_CONTRAVARIANT && !isVararg) OUT_VARIANCE else INVARIANT