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

[FIR] Replace KotlinScopeProvider with FirScopeProvider in ClassDeserialization

Browse Source 
This is needed to remove dependecy on :fir:resolve from serialization
  methods
This commit is contained in:
Dmitriy Novozhilov
2020-08-28 11:09:32 +03:00
parent 3aa13362ca
commit 92ffa4dea9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+2 -1
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE
import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID
import org.jetbrains.kotlin.fir.resolve.transformers.sealedInheritors import org.jetbrains.kotlin.fir.resolve.transformers.sealedInheritors
import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
@@ -48,7 +49,7 @@ fun deserializeClassToSymbol(
nameResolver: NameResolver, nameResolver: NameResolver,
session: FirSession, session: FirSession,
defaultAnnotationDeserializer: AbstractAnnotationDeserializer?, defaultAnnotationDeserializer: AbstractAnnotationDeserializer?,
scopeProvider: KotlinScopeProvider, scopeProvider: FirScopeProvider,
parentContext: FirDeserializationContext? = null, parentContext: FirDeserializationContext? = null,
containerSource: DeserializedContainerSource? = null, containerSource: DeserializedContainerSource? = null,
deserializeNestedClass: (ClassId, FirDeserializationContext) -> FirRegularClassSymbol? deserializeNestedClass: (ClassId, FirDeserializationContext) -> FirRegularClassSymbol?