[FIR] Rename FirDeclaration.session to declarationSiteSession

This commit is contained in:
Dmitriy Novozhilov
2021-04-21 12:34:00 +03:00
committed by TeamCityServer
parent 46f5c2073d
commit c3b1be1a39
136 changed files with 213 additions and 213 deletions
@@ -151,7 +151,7 @@ class JavaScopeProvider(
private tailrec fun FirRegularClass.findJavaSuperClass(): FirRegularClass? {
val superClass = superConeTypes.firstNotNullResult {
(it.lookupTag.toSymbol(session)?.fir as? FirRegularClass)?.takeIf { superClass ->
(it.lookupTag.toSymbol(declarationSiteSession)?.fir as? FirRegularClass)?.takeIf { superClass ->
superClass.classKind == ClassKind.CLASS
}
} ?: return null
@@ -166,7 +166,7 @@ class JavaScopeProvider(
DFS.dfs(listOf(this),
{ regularClass ->
regularClass.superConeTypes.mapNotNull {
it.lookupTag.toSymbol(session)?.fir as? FirRegularClass
it.lookupTag.toSymbol(declarationSiteSession)?.fir as? FirRegularClass
}
},
object : DFS.AbstractNodeHandler<FirRegularClass, Unit>() {
@@ -213,7 +213,7 @@ class JavaSymbolProvider(
) {
replaceSuperTypeRefs(
javaClass.supertypes.map { supertype ->
supertype.toFirResolvedTypeRef(session, javaTypeParameterStack, isForSupertypes = true, forTypeParameterBounds = false)
supertype.toFirResolvedTypeRef(declarationSiteSession, javaTypeParameterStack, isForSupertypes = true, forTypeParameterBounds = false)
}
)
}
@@ -354,7 +354,7 @@ class JavaSymbolProvider(
valueParametersForAnnotationConstructor.forEach { javaMethod, firValueParameter ->
javaMethod.annotationParameterDefaultValue?.let { javaDefaultValue ->
firValueParameter.defaultValue =
javaDefaultValue.toFirExpression(session, javaTypeParameterStack, firValueParameter.returnTypeRef)
javaDefaultValue.toFirExpression(declarationSiteSession, javaTypeParameterStack, firValueParameter.returnTypeRef)
}
}
}
@@ -435,7 +435,7 @@ private fun FirRegularClass.createRawArguments(
val erasedUpperBound = typeParameter.getErasedUpperBound {
defaultType().withArguments(defaultArgs.toTypedArray())
}
computeRawProjection(session, typeParameter, position, erasedUpperBound)
computeRawProjection(declarationSiteSession, typeParameter, position, erasedUpperBound)
}
private fun buildEnumCall(session: FirSession, classId: ClassId?, entryName: Name?) =
@@ -31,7 +31,7 @@ import kotlin.properties.Delegates
@OptIn(FirImplementationDetail::class)
class FirJavaClass @FirImplementationDetail internal constructor(
override val source: FirSourceElement?,
override val session: FirSession,
override val declarationSiteSession: FirSession,
override var resolvePhase: FirResolvePhase,
override val name: Name,
override val annotations: MutableList<FirAnnotationCall>,
@@ -29,7 +29,7 @@ import kotlin.properties.Delegates
@OptIn(FirImplementationDetail::class)
class FirJavaConstructor @FirImplementationDetail constructor(
override val source: FirSourceElement?,
override val session: FirSession,
override val declarationSiteSession: FirSession,
override val symbol: FirConstructorSymbol,
override val isPrimary: Boolean,
override var returnTypeRef: FirTypeRef,
@@ -33,7 +33,7 @@ import kotlin.properties.Delegates
@OptIn(FirImplementationDetail::class)
class FirJavaField @FirImplementationDetail constructor(
override val source: FirSourceElement?,
override val session: FirSession,
override val declarationSiteSession: FirSession,
override val symbol: FirFieldSymbol,
override val name: Name,
override var resolvePhase: FirResolvePhase,
@@ -51,7 +51,7 @@ import kotlin.properties.Delegates
@OptIn(FirImplementationDetail::class)
class FirJavaMethod @FirImplementationDetail constructor(
override val source: FirSourceElement?,
override val session: FirSession,
override val declarationSiteSession: FirSession,
override var resolvePhase: FirResolvePhase,
override val attributes: FirDeclarationAttributes,
override var returnTypeRef: FirTypeRef,
@@ -235,7 +235,7 @@ inline fun buildJavaMethodCopy(original: FirSimpleFunction, init: FirJavaMethodB
}
val copyBuilder = FirJavaMethodBuilder()
copyBuilder.source = original.source
copyBuilder.session = original.session
copyBuilder.session = original.declarationSiteSession
copyBuilder.resolvePhase = original.resolvePhase
copyBuilder.attributes = original.attributes.copy()
copyBuilder.returnTypeRef = original.returnTypeRef
@@ -27,7 +27,7 @@ import kotlin.contracts.contract
@OptIn(FirImplementationDetail::class)
class FirJavaValueParameter @FirImplementationDetail constructor(
override val source: FirSourceElement?,
override val session: FirSession,
override val declarationSiteSession: FirSession,
override var resolvePhase: FirResolvePhase,
override val attributes: FirDeclarationAttributes,
override var returnTypeRef: FirTypeRef,
@@ -182,7 +182,7 @@ inline fun buildJavaValueParameterCopy(original: FirValueParameter, init: FirJav
}
val copyBuilder = FirJavaValueParameterBuilder()
copyBuilder.source = original.source
copyBuilder.session = original.session
copyBuilder.session = original.declarationSiteSession
copyBuilder.attributes = original.attributes.copy()
copyBuilder.returnTypeRef = original.returnTypeRef
copyBuilder.name = original.name
@@ -382,13 +382,13 @@ class JavaClassUseSiteMemberScope(
}
private fun FirFunction<*>.computeJvmSignature(): String? {
return computeJvmSignature { it.toConeKotlinTypeProbablyFlexible(session, typeParameterStack) }
return computeJvmSignature { it.toConeKotlinTypeProbablyFlexible(declarationSiteSession, typeParameterStack) }
}
private fun FirFunction<*>.computeJvmDescriptor(customName: String? = null, includeReturnType: Boolean = false): String {
return computeJvmDescriptor(customName, includeReturnType) {
it.toConeKotlinTypeProbablyFlexible(
session,
declarationSiteSession,
typeParameterStack
)
}