diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt index 9bca87d1029..8305cadb2aa 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirModuleLazyDeclarationResolver.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirSingleRe import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeClassResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeFileResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.llFirModuleData -import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyResolverRunner import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.withOnAirDesignation @@ -43,7 +42,14 @@ internal class LLFirModuleLazyDeclarationResolver(val moduleComponents: LLFirMod toPhase: FirResolvePhase, ) { val fromPhase = target.resolvePhase - if (fromPhase >= toPhase) return + + /** + * Currently [lazyResolve] on file means [LLFirWholeFileResolveTarget], but also [FirFile] itself + * has [resolvePhase] which does not match with the entire file resolution state. + * This additional [FirFile] condition can be dropped after KT-61296 + */ + if (target !is FirFile && fromPhase >= toPhase) return + try { resolveContainingFileToImports(target) if (toPhase == FirResolvePhase.IMPORTS) return diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.kt new file mode 100644 index 00000000000..f3b2972fedd --- /dev/null +++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.kt @@ -0,0 +1,7 @@ +// DUMP_FILE + +fun foo(): Int { + return doSmth("str") +} + +fun doSmth(i: String) = 4 diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt new file mode 100644 index 00000000000..8fd2fcfdf48 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt @@ -0,0 +1,15 @@ +BEFORE MODIFICATION: +FILE: [ResolvedTo(BODY_RESOLVE)] topLevelFunctionWithTypeWithBodyDumpFile.kt + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { + ^foo R|/doSmth|(String(str)) + } + public final [ResolvedTo(BODY_RESOLVE)] fun doSmth([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/String|): R|kotlin/Int| { + ^doSmth Int(4) + } + +AFTER MODIFICATION: +FILE: [ResolvedTo(BODY_RESOLVE)] topLevelFunctionWithTypeWithBodyDumpFile.kt + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } + public final [ResolvedTo(BODY_RESOLVE)] fun doSmth([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/String|): R|kotlin/Int| { + ^doSmth Int(4) + } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractCodeFragmentInBlockModificationTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractCodeFragmentInBlockModificationTest.kt index 3271f6a5294..c220ff74b1f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractCodeFragmentInBlockModificationTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractCodeFragmentInBlockModificationTest.kt @@ -21,7 +21,7 @@ abstract class AbstractCodeFragmentInBlockModificationTest : AbstractLowLevelApi assertNull(targetElement.getNonLocalReanalyzableContainingDeclaration()) - val (before, after) = testInBlockModification(ktCodeFragment, ktCodeFragment, testServices) + val (before, after) = testInBlockModification(ktCodeFragment, ktCodeFragment, testServices, dumpFirFile = false) val actualText = "BEFORE MODIFICATION:\n$before\nAFTER MODIFICATION:\n$after" testServices.assertions.assertEqualsToTestDataFileSibling(actualText) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt index aebde3c5784..bc99fa84d10 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure import com.intellij.extapi.psi.ASTDelegatePsiElement +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirOfType import org.jetbrains.kotlin.analysis.low.level.api.fir.lazyResolveRenderer import org.jetbrains.kotlin.analysis.low.level.api.fir.resolveWithCaches @@ -16,15 +17,24 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.Analys import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase import org.jetbrains.kotlin.psi.KtAnnotated import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions abstract class AbstractInBlockModificationTest : AbstractLowLevelApiSingleFileTest() { + override fun configureTest(builder: TestConfigurationBuilder) { + super.configureTest(builder) + builder.useDirectives(Directives) + } + override fun doTestByFileStructure(ktFile: KtFile, moduleStructure: TestModuleStructure, testServices: TestServices) { val selectedElement = testServices.expressionMarkerProvider.getSelectedElementOfTypeByDirective( ktFile = ktFile, @@ -33,7 +43,13 @@ abstract class AbstractInBlockModificationTest : AbstractLowLevelApiSingleFileTe val declaration = selectedElement.getNonLocalReanalyzableContainingDeclaration() val actual = if (declaration != null) { - val (before, after) = testInBlockModification(ktFile, declaration, testServices) + val (before, after) = testInBlockModification( + file = ktFile, + declaration = declaration, + testServices = testServices, + dumpFirFile = Directives.DUMP_FILE in moduleStructure.allDirectives, + ) + "BEFORE MODIFICATION:\n$before\nAFTER MODIFICATION:\n$after" } else { "IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE" @@ -41,33 +57,55 @@ abstract class AbstractInBlockModificationTest : AbstractLowLevelApiSingleFileTe testServices.assertions.assertEqualsToTestDataFileSibling(actual) } + + private object Directives : SimpleDirectivesContainer() { + val DUMP_FILE by directive("Dump the entire FirFile to the output") + } } -internal fun testInBlockModification(file: KtFile, declaration: KtAnnotated, testServices: TestServices): Pair { - return resolveWithCaches(file) { firSession -> - val firDeclarationBefore = declaration.getOrBuildFirOfType(firSession) - val declarationTextBefore = firDeclarationBefore.render() - - declaration.modifyBody() - invalidateAfterInBlockModification(declaration) - - val declarationTextAfterModification = firDeclarationBefore.render() - testServices.assertions.assertNotEquals(declarationTextBefore, declarationTextAfterModification) { - "The declaration before and after modification must be in different state" - } - - val firDeclarationAfter = declaration.getOrBuildFirOfType(firSession) - testServices.assertions.assertEquals(firDeclarationBefore, firDeclarationAfter) { - "The declaration before and after must be the same" - } - - val declarationTextAfter = firDeclarationAfter.render() - testServices.assertions.assertEquals(declarationTextBefore, declarationTextAfter) { - "The declaration must have the same in the resolved state" - } - - Pair(declarationTextBefore, declarationTextAfterModification) +internal fun testInBlockModification( + file: KtFile, + declaration: KtAnnotated, + testServices: TestServices, + dumpFirFile: Boolean, +): Pair = resolveWithCaches(file) { firSession -> + val firDeclarationBefore = declaration.getOrBuildFirOfType(firSession) + val declarationToRender = if (dumpFirFile) { + file.getOrBuildFirFile(firSession).also { it.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) } + } else { + firDeclarationBefore } + + val textBefore = declarationToRender.render() + + declaration.modifyBody() + invalidateAfterInBlockModification(declaration) + + val textAfterModification = declarationToRender.render() + testServices.assertions.assertNotEquals(textBefore, textAfterModification) { + "The declaration before and after modification must be in different state" + } + + val textAfter = if (dumpFirFile) { + // we should resolve the entire file instead of the declaration to be sure that this declaration will be + // resolved by file resolution as well + declarationToRender.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) + declarationToRender.render() + } else { + declaration.getOrBuildFirOfType(firSession) + declarationToRender.render() + } + + val firDeclarationAfter = declaration.getOrBuildFirOfType(firSession) + testServices.assertions.assertEquals(firDeclarationBefore, firDeclarationAfter) { + "The declaration before and after must be the same" + } + + testServices.assertions.assertEquals(textBefore, textAfter) { + "The declaration must have the same in the resolved state" + } + + Pair(textBefore, textAfterModification) } /** diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/OutOfContentRootInBlockModificationTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/OutOfContentRootInBlockModificationTestGenerated.java index 47fb201a881..f786b24e3a9 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/OutOfContentRootInBlockModificationTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/OutOfContentRootInBlockModificationTestGenerated.java @@ -288,6 +288,12 @@ public class OutOfContentRootInBlockModificationTestGenerated extends AbstractOu runTest("analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt"); } + @Test + @TestMetadata("topLevelFunctionWithTypeWithBodyDumpFile.kt") + public void testTopLevelFunctionWithTypeWithBodyDumpFile() throws Exception { + runTest("analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.kt"); + } + @Test @TestMetadata("topLevelFunctionWithTypeWithoutBody.kt") public void testTopLevelFunctionWithTypeWithoutBody() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/SourceInBlockModificationTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/SourceInBlockModificationTestGenerated.java index bfbe7aab65c..75ebbb0e9c1 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/SourceInBlockModificationTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/SourceInBlockModificationTestGenerated.java @@ -288,6 +288,12 @@ public class SourceInBlockModificationTestGenerated extends AbstractSourceInBloc runTest("analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt"); } + @Test + @TestMetadata("topLevelFunctionWithTypeWithBodyDumpFile.kt") + public void testTopLevelFunctionWithTypeWithBodyDumpFile() throws Exception { + runTest("analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.kt"); + } + @Test @TestMetadata("topLevelFunctionWithTypeWithoutBody.kt") public void testTopLevelFunctionWithTypeWithoutBody() throws Exception {