From 94ec22762a0661511799ca528b2e295eb49818ac Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 23 Jan 2020 10:57:31 +0300 Subject: [PATCH] Rename: FirLibrarySymbolProviderImpl -> FirBuiltinSymbolProvider --- .../kotlin/fir/java/FirJavaModuleBasedSession.kt | 4 ++-- ...mbolProviderImpl.kt => FirBuiltinSymbolProvider.kt} | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/{FirLibrarySymbolProviderImpl.kt => FirBuiltinSymbolProvider.kt} (97%) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt index b149430e2f4..b53b9f545a3 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.ConeCallConflictResolverFactory import org.jetbrains.kotlin.fir.resolve.calls.jvm.JvmCallConflictResolverFactory import org.jetbrains.kotlin.fir.resolve.impl.FirCompositeSymbolProvider import org.jetbrains.kotlin.fir.resolve.impl.FirDependenciesSymbolProviderImpl -import org.jetbrains.kotlin.fir.resolve.impl.FirLibrarySymbolProviderImpl +import org.jetbrains.kotlin.fir.resolve.impl.FirBuiltinSymbolProvider import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider @@ -95,7 +95,7 @@ class FirLibrarySession private constructor( FirSymbolProvider::class, FirCompositeSymbolProvider( listOf( - FirLibrarySymbolProviderImpl(this, kotlinScopeProvider), + FirBuiltinSymbolProvider(this, kotlinScopeProvider), KotlinDeserializedJvmSymbolsProvider( this, sessionProvider.project, packagePartProvider, diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt similarity index 97% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt index 7a51c1316a0..250c29f92a0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import java.io.InputStream -class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvider: KotlinScopeProvider) : FirSymbolProvider() { +class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider: KotlinScopeProvider) : FirSymbolProvider() { private class BuiltInsPackageFragment( stream: InputStream, val fqName: FqName, val session: FirSession, val kotlinScopeProvider: KotlinScopeProvider @@ -169,7 +169,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi typeParameters.addAll((1..arity).map { FirTypeParameterImpl( null, - this@FirLibrarySymbolProviderImpl.session, + this@FirBuiltinSymbolProvider.session, Name.identifier("P$it"), FirTypeParameterSymbol(), Variance.IN_VARIANCE, @@ -181,7 +181,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi typeParameters.add( FirTypeParameterImpl( null, - this@FirLibrarySymbolProviderImpl.session, + this@FirBuiltinSymbolProvider.session, Name.identifier("R"), FirTypeParameterSymbol(), Variance.OUT_VARIANCE, @@ -214,7 +214,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi addDeclaration( FirSimpleFunctionImpl( null, - this@FirLibrarySymbolProviderImpl.session, + this@FirBuiltinSymbolProvider.session, typeArguments.last(), null, name, @@ -226,7 +226,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi val parameterName = Name.identifier("p${index + 1}") FirValueParameterImpl( null, - this@FirLibrarySymbolProviderImpl.session, + this@FirBuiltinSymbolProvider.session, typeArgument, parameterName, FirVariableSymbol(parameterName),