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

Rename: FirLibrarySymbolProviderImpl -> FirBuiltinSymbolProvider

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-01-23 10:57:31 +03:00
parent 2086c34cb9
commit 94ec22762a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
+2 -2
View File
@@ -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.calls.jvm.JvmCallConflictResolverFactory
import org.jetbrains.kotlin.fir.resolve.impl.FirCompositeSymbolProvider import org.jetbrains.kotlin.fir.resolve.impl.FirCompositeSymbolProvider
import org.jetbrains.kotlin.fir.resolve.impl.FirDependenciesSymbolProviderImpl 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.impl.FirProviderImpl
import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
@@ -95,7 +95,7 @@ class FirLibrarySession private constructor(
FirSymbolProvider::class, FirSymbolProvider::class,
FirCompositeSymbolProvider( FirCompositeSymbolProvider(
listOf( listOf(
FirLibrarySymbolProviderImpl(this, kotlinScopeProvider), FirBuiltinSymbolProvider(this, kotlinScopeProvider),
KotlinDeserializedJvmSymbolsProvider( KotlinDeserializedJvmSymbolsProvider(
this, sessionProvider.project, this, sessionProvider.project,
packagePartProvider, packagePartProvider,
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirLibrarySymbolProviderImpl.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt
+5 -5
View File
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
import java.io.InputStream 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( private class BuiltInsPackageFragment(
stream: InputStream, val fqName: FqName, val session: FirSession, stream: InputStream, val fqName: FqName, val session: FirSession,
val kotlinScopeProvider: KotlinScopeProvider val kotlinScopeProvider: KotlinScopeProvider
@@ -169,7 +169,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi
typeParameters.addAll((1..arity).map { typeParameters.addAll((1..arity).map {
FirTypeParameterImpl( FirTypeParameterImpl(
null, null,
this@FirLibrarySymbolProviderImpl.session, this@FirBuiltinSymbolProvider.session,
Name.identifier("P$it"), Name.identifier("P$it"),
FirTypeParameterSymbol(), FirTypeParameterSymbol(),
Variance.IN_VARIANCE, Variance.IN_VARIANCE,
@@ -181,7 +181,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi
typeParameters.add( typeParameters.add(
FirTypeParameterImpl( FirTypeParameterImpl(
null, null,
this@FirLibrarySymbolProviderImpl.session, this@FirBuiltinSymbolProvider.session,
Name.identifier("R"), Name.identifier("R"),
FirTypeParameterSymbol(), FirTypeParameterSymbol(),
Variance.OUT_VARIANCE, Variance.OUT_VARIANCE,
@@ -214,7 +214,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi
addDeclaration( addDeclaration(
FirSimpleFunctionImpl( FirSimpleFunctionImpl(
null, null,
this@FirLibrarySymbolProviderImpl.session, this@FirBuiltinSymbolProvider.session,
typeArguments.last(), typeArguments.last(),
null, null,
name, name,
@@ -226,7 +226,7 @@ class FirLibrarySymbolProviderImpl(val session: FirSession, val kotlinScopeProvi
val parameterName = Name.identifier("p${index + 1}") val parameterName = Name.identifier("p${index + 1}")
FirValueParameterImpl( FirValueParameterImpl(
null, null,
this@FirLibrarySymbolProviderImpl.session, this@FirBuiltinSymbolProvider.session,
typeArgument, typeArgument,
parameterName, parameterName,
FirVariableSymbol(parameterName), FirVariableSymbol(parameterName),