From ba947fbf04168ba552873399c032aaa61adbd68a Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 13 Feb 2024 20:12:17 +0100 Subject: [PATCH] [LL FIR] RawFirNonLocalDeclarationBuilder: drop redundant functions They are obsolete as we dropped on-air resolution logic --- .../RawFirNonLocalDeclarationBuilder.kt | 22 ------------------- .../AbstractPartialRawFirBuilderTestCase.kt | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt index 0e7aabdae7a..c0ed8854b67 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirNonLocalDeclarationBuilder.kt @@ -47,28 +47,6 @@ internal class RawFirNonLocalDeclarationBuilder private constructor( private val replacementApplier: RawFirReplacement.Applier? = null, ) : PsiRawFirBuilder(session, baseScopeProvider, bodyBuildingMode = BodyBuildingMode.NORMAL) { companion object { - fun buildNewFile( - session: FirSession, - scopeProvider: FirScopeProvider, - file: KtFile, - ): FirFile { - val builder = PsiRawFirBuilder(session, scopeProvider, bodyBuildingMode = BodyBuildingMode.NORMAL) - return builder.buildFirFile(file) - } - - fun buildWithReplacement( - session: FirSession, - scopeProvider: FirScopeProvider, - designation: FirDesignation, - rootNonLocalDeclaration: KtElement, - replacement: RawFirReplacement?, - ): FirDeclaration { - val replacementApplier = replacement?.Applier() - val result = build(session, scopeProvider, designation, rootNonLocalDeclaration, replacementApplier = replacementApplier) - replacementApplier?.ensureApplied() - return result - } - fun buildWithFunctionSymbolRebind( session: FirSession, scopeProvider: FirScopeProvider, diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractPartialRawFirBuilderTestCase.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractPartialRawFirBuilderTestCase.kt index 5f8e14cb9dd..dc68e818693 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractPartialRawFirBuilderTestCase.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractPartialRawFirBuilderTestCase.kt @@ -125,12 +125,11 @@ abstract class AbstractPartialRawFirBuilderTestCase : AbstractAnalysisApiBasedTe val designation = designationBuilder.resultDesignation TestCase.assertTrue(designation != null) - val firElement = RawFirNonLocalDeclarationBuilder.buildWithReplacement( + val firElement = RawFirNonLocalDeclarationBuilder.buildWithFunctionSymbolRebind( session = session, scopeProvider = scopeProvider, designation!!, elementToBuild, - null ) val firDump = FirRenderer(idRenderer = ConeIdFullRenderer()).renderElementAsString(firElement)