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

[FIR] Unmake FirSamResolver as session component

Browse Source 
It can not be stored in session because it depends on scope session
  and have mutable state
This commit is contained in:
Dmitriy Novozhilov
2020-09-08 16:07:57 +03:00
parent 29addd2a2b
commit caf325934c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+5 -5
View File
@@ -33,10 +33,10 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
interface FirSamResolver : FirSessionComponent { abstract class FirSamResolver {
fun getFunctionTypeForPossibleSamType(type: ConeKotlinType): ConeKotlinType? abstract fun getFunctionTypeForPossibleSamType(type: ConeKotlinType): ConeKotlinType?
fun shouldRunSamConversionForFunction(firFunction: FirFunction<*>): Boolean abstract fun shouldRunSamConversionForFunction(firFunction: FirFunction<*>): Boolean
fun getSamConstructor(firRegularClass: FirRegularClass): FirSimpleFunction? abstract fun getSamConstructor(firRegularClass: FirRegularClass): FirSimpleFunction?
} }
private val NULL_STUB = Any() private val NULL_STUB = Any()
@@ -45,7 +45,7 @@ val SAM_PARAMETER_NAME = Name.identifier("block")
class FirSamResolverImpl( class FirSamResolverImpl(
private val firSession: FirSession, private val firSession: FirSession,
private val scopeSession: ScopeSession, private val scopeSession: ScopeSession,
) : FirSamResolver { ) : FirSamResolver() {
private val resolvedFunctionType: MutableMap<FirRegularClass, Any> = mutableMapOf() private val resolvedFunctionType: MutableMap<FirRegularClass, Any> = mutableMapOf()
private val samConstructor: MutableMap<FirRegularClass, Any> = mutableMapOf() private val samConstructor: MutableMap<FirRegularClass, Any> = mutableMapOf()