From 3b85715f0ff6a5b07c528f0a7f6bcf024011f72d Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 26 Apr 2023 18:07:32 +0200 Subject: [PATCH] [LL FIR] fix KtFirReferenceShortener collection for the whole file previously it worked only for separate declarations ^KT-57966 fixed --- .../api/fir/components/KtFirReferenceShortener.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index 35ae594dd6b..660f09680e5 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -75,7 +75,7 @@ internal class KtFirReferenceShortener( callableShortenOption: (KtCallableSymbol) -> ShortenOption ): ShortenCommand { val declarationToVisit = file.findSmallestDeclarationContainingSelection(selection) - ?: file.withDeclarationsResolvedToBodyResolve() + ?: file val firDeclaration = declarationToVisit.getOrBuildFir(firResolveSession) as? FirDeclaration ?: return ShortenCommandImpl( file.createSmartPointer(), @@ -108,14 +108,6 @@ internal class KtFirReferenceShortener( collector.qualifiersToShorten.map { it.element }.distinct().map { it.createSmartPointer() } ) } - - private fun KtFile.withDeclarationsResolvedToBodyResolve(): KtFile { - for (declaration in declarations) { - declaration.getOrBuildFir(firResolveSession) // temporary hack, resolves declaration to BODY_RESOLVE stage - } - - return this - } } private fun KtFile.findSmallestDeclarationContainingSelection(selection: TextRange): KtDeclaration? =