diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index 0c9d66c2158..a138d288222 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -380,7 +380,6 @@ class FirElementSerializer private constructor( * Order of nested classifiers: * - declared classifiers in declaration order * - generated classifiers in sorted order - * - provided classifiers in sorted order */ fun computeNestedClassifiersForClass(classSymbol: FirClassSymbol<*>): List> { val scope = session.nestedClassifierScope(classSymbol.fir) ?: return emptyList() @@ -391,11 +390,6 @@ class FirElementSerializer private constructor( .partition { it in indexByDeclaration } declared.sortedBy { indexByDeclaration.getValue(it) }.mapTo(this) { it.symbol } nonDeclared.sortedWith(FirMemberDeclarationComparator).mapTo(this) { it.symbol } - - providedDeclarationsService.getProvidedNestedClassifiers(classSymbol, scopeSession) - .map { it.fir } - .sortedWith(FirMemberDeclarationComparator) - .mapTo(this) { it.symbol } } } diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirProvidedDeclarationsForMetadataService.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirProvidedDeclarationsForMetadataService.kt index 242d9ec7c58..d804f5e2b1f 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirProvidedDeclarationsForMetadataService.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirProvidedDeclarationsForMetadataService.kt @@ -66,7 +66,6 @@ abstract class FirProvidedDeclarationsForMetadataService : FirSessionComponent { abstract fun getProvidedTopLevelDeclarations(packageFqName: FqName, scopeSession: ScopeSession): List abstract fun getProvidedConstructors(owner: FirClassSymbol<*>, scopeSession: ScopeSession): List abstract fun getProvidedCallables(owner: FirClassSymbol<*>, scopeSession: ScopeSession): List - abstract fun getProvidedNestedClassifiers(owner: FirClassSymbol<*>, scopeSession: ScopeSession): List> abstract fun registerDeclaration(declaration: FirCallableDeclaration) @@ -105,11 +104,6 @@ private class FirProvidedDeclarationsForMetadataServiceImpl(private val session: return memberCache[owner]?.providedCallables ?: emptyList() } - override fun getProvidedNestedClassifiers(owner: FirClassSymbol<*>, scopeSession: ScopeSession): List> { - // TODO: remove - return emptyList() - } - private class ClassDeclarations { val providedCallables: MutableList = mutableListOf() val providedConstructors: MutableList = mutableListOf()