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

[FIR Java] More precise synthetic setter search in use-site scope

Browse Source 
In this commit we detect both Java void & Kotlin Unit return types
This commit is contained in:
Mikhail Glukhikh
2020-10-30 18:20:55 +03:00
parent c515af4373
commit e0abf3a62c
1 changed files with 13 additions and 2 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
+13 -2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.java.scopes package org.jetbrains.kotlin.fir.java.scopes
import com.intellij.lang.jvm.types.JvmPrimitiveTypeKind
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
@@ -21,6 +22,8 @@ import org.jetbrains.kotlin.fir.scopes.impl.AbstractFirUseSiteMemberScope
import org.jetbrains.kotlin.fir.symbols.CallableId 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.load.java.structure.impl.JavaPrimitiveTypeImpl
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
class JavaClassUseSiteMemberScope( class JavaClassUseSiteMemberScope(
@@ -101,8 +104,16 @@ class JavaClassUseSiteMemberScope(
declaredMemberScope.processFunctionsByName(setterName) { functionSymbol -> declaredMemberScope.processFunctionsByName(setterName) { functionSymbol ->
if (setterSymbol == null && functionSymbol is FirNamedFunctionSymbol) { if (setterSymbol == null && functionSymbol is FirNamedFunctionSymbol) {
val function = functionSymbol.fir val function = functionSymbol.fir
if (!function.isStatic && function.returnTypeRef.isUnit && function.valueParameters.size == 1) { if (!function.isStatic && function.valueParameters.size == 1) {
setterSymbol = functionSymbol val returnTypeRef = function.returnTypeRef
if (returnTypeRef.isUnit) {
setterSymbol = functionSymbol
} else if (returnTypeRef is FirJavaTypeRef) {
val primitiveType = returnTypeRef.type as? JavaPrimitiveTypeImpl
if (primitiveType?.psi?.kind == JvmPrimitiveTypeKind.VOID) {
setterSymbol = functionSymbol
}
}
} }
} }
} }