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

Optimize for void return type for functions with no return type

Browse Source 
+ small refacroring
This commit is contained in:
Igor Yakovlev
2019-06-05 13:55:39 +03:00
parent 9e904598fb
commit 0d51a2ec43
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt
+16 -7
View File
@@ -171,11 +171,7 @@ internal class UltraLightMembersCreator(
val returnType: PsiType? by lazyPub {
when {
isConstructor -> null
isSuspendFunction -> support.moduleDescriptor
.builtIns
.nullableAnyType
.asPsiType(support, TypeMappingMode.DEFAULT, wrapper)
else -> methodReturnType(ktFunction, wrapper)
else -> methodReturnType(ktFunction, wrapper, isSuspendFunction)
}
}
@@ -188,7 +184,20 @@ internal class UltraLightMembersCreator(
method.delegate.addParameter(KtUltraLightReceiverParameter(callable, support, method))
}
private fun methodReturnType(ktDeclaration: KtDeclaration, wrapper: KtUltraLightMethod): PsiType {
private fun methodReturnType(ktDeclaration: KtDeclaration, wrapper: KtUltraLightMethod, isSuspendFunction: Boolean): PsiType {
if (isSuspendFunction) {
return support.moduleDescriptor
.builtIns
.nullableAnyType
.asPsiType(support, TypeMappingMode.DEFAULT, wrapper)
}
if (ktDeclaration is KtNamedFunction &&
ktDeclaration.hasBlockBody() &&
!ktDeclaration.hasDeclaredReturnType()
) return PsiType.VOID
val desc =
ktDeclaration.resolve()?.getterIfProperty() as? FunctionDescriptor
?: return PsiType.NULL
@@ -359,7 +368,7 @@ internal class UltraLightMembersCreator(
val getterName = computeMethodName(ktGetter ?: declaration, JvmAbi.getterName(propertyName), MethodType.GETTER)
val getterPrototype = lightMethod(getterName, ktGetter ?: declaration, onlyJvmStatic || forceStatic)
val getterWrapper = KtUltraLightMethodForSourceDeclaration(getterPrototype, declaration, support, containingClass)
val getterType: PsiType by lazyPub { methodReturnType(declaration, getterWrapper) }
val getterType: PsiType by lazyPub { methodReturnType(declaration, getterWrapper, isSuspendFunction = false) }
getterPrototype.setMethodReturnType { getterType }
addReceiverParameter(declaration, getterWrapper)
result.add(getterWrapper)