From 0cce0fbbfb43a87fb2995c4d80bf750bb30c8d66 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 27 Oct 2021 13:05:32 +0300 Subject: [PATCH] [FIR] Remove unused methods from FirProvider Those methods were created for first prototype of FIR plugin API, and now they are completely redundant --- .../FirIdeBuiltinsAndCloneableSessionProvider.kt | 9 --------- .../fir/providers/FirIdeLibrariesSessionProvider.kt | 9 --------- .../low/level/api/fir/providers/FirIdeProvider.kt | 13 ------------- .../kotlin/fir/resolve/providers/FirProvider.kt | 9 --------- .../providers/impl/FirLibrarySessionProvider.kt | 9 --------- .../fir/resolve/providers/impl/FirProviderImpl.kt | 11 ----------- 6 files changed, 60 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt index b32c29a8709..c94bb4a67b3 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt @@ -6,11 +6,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.providers import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.resolve.providers.FirProvider -import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.name.ClassId @@ -27,12 +24,6 @@ internal class FirIdeBuiltinsAndCloneableSessionProvider(override val symbolProv override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? = null override fun getFirFilesByPackage(fqName: FqName): List = emptyList() - @FirProviderInternals - override fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) = shouldNotBeCalled() - - @FirProviderInternals - override fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) = shouldNotBeCalled() - override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirIdeBuiltinsAndCloneableSession") diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt index 2a2c21581b3..7528bfe78c2 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeLibrariesSessionProvider.kt @@ -6,11 +6,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.providers import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.resolve.providers.FirProvider -import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.name.ClassId @@ -29,12 +26,6 @@ internal class FirIdeLibrariesSessionProvider( override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? = null override fun getFirFilesByPackage(fqName: FqName): List = emptyList() - @FirProviderInternals - override fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) = shouldNotBeCalled() - - @FirProviderInternals - override fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) = shouldNotBeCalled() - override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirIdeLibrariesSessionProvider") diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt index 028101a46b9..295c5fd103e 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/FirIdeProvider.kt @@ -15,13 +15,10 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.NoMutableState import org.jetbrains.kotlin.fir.ThreadSafeMutableState import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.originalForSubstitutionOverride import org.jetbrains.kotlin.fir.resolve.providers.FirProvider -import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider @@ -90,16 +87,6 @@ internal class FirIdeProvider( override fun getFirFilesByPackage(fqName: FqName): List = error("Should not be called in FIR IDE") - @FirProviderInternals - override fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) { - TODO() - } - - @FirProviderInternals - override fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) { - TODO() - } - override fun getClassNamesInPackage(fqName: FqName): Set = declarationProvider.getClassNamesInPackage(fqName) diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/FirProvider.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/FirProvider.kt index 644565ee2c0..a51c7e11928 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/FirProvider.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/providers/FirProvider.kt @@ -17,9 +17,6 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -@RequiresOptIn -annotation class FirProviderInternals - abstract class FirProvider : FirSessionComponent { /** * [symbolProvider] for [FirProvider] may provide only symbols from sources of current module @@ -44,12 +41,6 @@ abstract class FirProvider : FirSessionComponent { abstract fun getFirFilesByPackage(fqName: FqName): List - @FirProviderInternals - abstract fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) - - @FirProviderInternals - abstract fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) - abstract fun getClassNamesInPackage(fqName: FqName): Set } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt index 4abfcaf515e..8463f894bc2 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt @@ -6,11 +6,8 @@ package org.jetbrains.kotlin.fir.resolve.providers.impl import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.resolve.providers.FirProvider -import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.name.ClassId @@ -29,12 +26,6 @@ class FirLibrarySessionProvider( override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? = null override fun getFirFilesByPackage(fqName: FqName): List = emptyList() - @FirProviderInternals - override fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) = shouldNotBeCalled() - - @FirProviderInternals - override fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) = shouldNotBeCalled() - override fun getClassNamesInPackage(fqName: FqName): Set = shouldNotBeCalled() private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirLibrarySessionProvider") diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt index fc4ca5408cd..7400f45076f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.resolve.providers.FirProvider -import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider @@ -77,16 +76,6 @@ class FirProviderImpl(val session: FirSession, val kotlinScopeProvider: FirKotli } } - @FirProviderInternals - override fun recordGeneratedClass(owner: FirDeclaration, klass: FirRegularClass) { - klass.accept(FirRecorder, FirRecorderData(state, owner.file, session.nameConflictsTracker)) - } - - @FirProviderInternals - override fun recordGeneratedMember(owner: FirDeclaration, klass: FirDeclaration) { - klass.accept(FirRecorder, FirRecorderData(state, owner.file, session.nameConflictsTracker)) - } - private val FirDeclaration.file: FirFile get() = when (this) { is FirFile -> this