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

FIR Java: handle primitive void return type for synthetic setter

Browse Source
This commit is contained in:
Jinseong Jeon
2020-11-17 04:19:17 -08:00
committed by teamcityserver
parent 5c61079d75
commit 77ce5ea15d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt
+12 -3
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.isUnit import org.jetbrains.kotlin.fir.types.isUnit
import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef import org.jetbrains.kotlin.fir.types.jvm.FirJavaTypeRef
import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType
import org.jetbrains.kotlin.load.java.structure.impl.JavaPrimitiveTypeImpl import org.jetbrains.kotlin.load.java.structure.impl.JavaPrimitiveTypeImpl
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -107,11 +108,19 @@ class JavaClassUseSiteMemberScope(
if (!function.isStatic && function.valueParameters.size == 1) { if (!function.isStatic && function.valueParameters.size == 1) {
val returnTypeRef = function.returnTypeRef val returnTypeRef = function.returnTypeRef
if (returnTypeRef.isUnit) { if (returnTypeRef.isUnit) {
// Unit return type
setterSymbol = functionSymbol setterSymbol = functionSymbol
} else if (returnTypeRef is FirJavaTypeRef) { } else if (returnTypeRef is FirJavaTypeRef) {
val primitiveType = returnTypeRef.type as? JavaPrimitiveTypeImpl // Void/void return type
if (primitiveType?.psi?.kind == JvmPrimitiveTypeKind.VOID) { when (val returnType = returnTypeRef.type) {
setterSymbol = functionSymbol is JavaPrimitiveTypeImpl ->
if (returnType.psi.kind == JvmPrimitiveTypeKind.VOID) {
setterSymbol = functionSymbol
}
is JavaPrimitiveType ->
if (returnType.type == null) {
setterSymbol = functionSymbol
}
} }
} }
} }