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

more renames to get rid of "Jet" in class and method names

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-09 19:06:50 +01:00
parent a3241637ce
commit e64a270d1a
152 changed files with 465 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+2 -2
View File
@@ -50,7 +50,7 @@ class LazyJavaTypeResolver(
return when (javaType) {
is JavaPrimitiveType -> {
val primitiveType = javaType.getType()
if (primitiveType != null) c.module.builtIns.getPrimitiveJetType(primitiveType)
if (primitiveType != null) c.module.builtIns.getPrimitiveKotlinType(primitiveType)
else c.module.builtIns.getUnitType()
}
is JavaClassifierType ->
@@ -70,7 +70,7 @@ class LazyJavaTypeResolver(
val javaComponentType = arrayType.getComponentType()
val primitiveType = (javaComponentType as? JavaPrimitiveType)?.getType()
if (primitiveType != null) {
val jetType = c.module.builtIns.getPrimitiveArrayJetType(primitiveType)
val jetType = c.module.builtIns.getPrimitiveArrayKotlinType(primitiveType)
return@run if (PLATFORM_TYPES && attr.allowFlexible)
FlexibleJavaClassifierTypeCapabilities.create(jetType, TypeUtils.makeNullable(jetType))
else TypeUtils.makeNullableAsSpecified(jetType, !attr.isMarkedNotNull)