From bba1eeac82c89adec6255fa31d9e7fc60fbcf524 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 26 Jul 2023 21:21:14 +0200 Subject: [PATCH] [LL FIR] AbstractInnerDeclarationsResolvePhaseTest use .txt instead of .fir.txt ^KT-60728 --- ...ymousClass.fir.txt => annonymousClass.txt} | 0 ...ots.fir.txt => class.out_of_src_roots.txt} | 0 .../{class.fir.txt => class.txt} | 0 ...meter.fir.txt => constructorParameter.txt} | 0 .../{enum.fir.txt => enum.txt} | 0 ...thoutTypes.fir.txt => funWithoutTypes.txt} | 0 ...ter.fir.txt => functionValueParameter.txt} | 0 ...tionWithImplicitType.out_of_src_roots.txt} | 0 ...e.fir.txt => functionWithImplicitType.txt} | 0 .../innerDeclarationsResolve/lambda.fir.txt | 23 ------------------- ...dy.fir.txt => lambdaInImplicitFunBody.txt} | 0 ...r.txt => lambdaInImplicitPropertyBody.txt} | 0 ....fir.txt => lambdasInWithBodyFunction.txt} | 0 .../{localClass.fir.txt => localClass.txt} | 0 ...ir.txt => propertyWithGetterAndSetter.txt} | 0 ...hSetter.fir.txt => propertyWithSetter.txt} | 0 ...stractInnerDeclarationsResolvePhaseTest.kt | 6 ++--- 17 files changed, 3 insertions(+), 26 deletions(-) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{annonymousClass.fir.txt => annonymousClass.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{class.out_of_src_roots.fir.txt => class.out_of_src_roots.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{class.fir.txt => class.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{constructorParameter.fir.txt => constructorParameter.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{enum.fir.txt => enum.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{funWithoutTypes.fir.txt => funWithoutTypes.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{functionValueParameter.fir.txt => functionValueParameter.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{functionWithImplicitType.out_of_src_roots.fir.txt => functionWithImplicitType.out_of_src_roots.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{functionWithImplicitType.fir.txt => functionWithImplicitType.txt} (100%) delete mode 100644 analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambda.fir.txt rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{lambdaInImplicitFunBody.fir.txt => lambdaInImplicitFunBody.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{lambdaInImplicitPropertyBody.fir.txt => lambdaInImplicitPropertyBody.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{lambdasInWithBodyFunction.fir.txt => lambdasInWithBodyFunction.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{localClass.fir.txt => localClass.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{propertyWithGetterAndSetter.fir.txt => propertyWithGetterAndSetter.txt} (100%) rename analysis/low-level-api-fir/testdata/innerDeclarationsResolve/{propertyWithSetter.fir.txt => propertyWithSetter.txt} (100%) diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/annonymousClass.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/annonymousClass.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/annonymousClass.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/annonymousClass.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.out_of_src_roots.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.out_of_src_roots.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.out_of_src_roots.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.out_of_src_roots.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/class.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/constructorParameter.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/enum.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/funWithoutTypes.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/funWithoutTypes.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/funWithoutTypes.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/funWithoutTypes.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionValueParameter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionValueParameter.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionValueParameter.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionValueParameter.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.out_of_src_roots.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.out_of_src_roots.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.out_of_src_roots.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.out_of_src_roots.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/functionWithImplicitType.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambda.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambda.fir.txt deleted file mode 100644 index 4a039ac073a..00000000000 --- a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambda.fir.txt +++ /dev/null @@ -1,23 +0,0 @@ -FILE: lambda.kt - public final inline [BODY_RESOLVE] fun with([BODY_RESOLVE] receiver: R|T|, [BODY_RESOLVE] block: R|T.() -> R|): R|R| { - ^with R|/block|.R|SubstitutionOverride|(R|/receiver|) - } - public final inline [BODY_RESOLVE] fun R|T|.let([BODY_RESOLVE] block: R|(T) -> R|): R|R| { - ^let R|/block|.R|SubstitutionOverride|(this@R|/let|) - } - public final [BODY_RESOLVE] class B : R|kotlin/Any| { - public [BODY_RESOLVE] constructor(): R|B| { - super() - } - - public final [BODY_RESOLVE] fun foo([BODY_RESOLVE] a: R|kotlin/Int|): R|kotlin/String| { - ^foo R|/with|(R|/a|, = [BODY_RESOLVE] with@fun R|kotlin/Int|.(): R|kotlin/String| { - ^ this@R|special/anonymous|.R|kotlin/Any.toString|().R|/let|( = [BODY_RESOLVE] let@fun ([BODY_RESOLVE] it: R|kotlin/String|): R|kotlin/String| { - ^ R|/it| - } - ) - } - ) - } - - } diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitFunBody.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitFunBody.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitFunBody.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitFunBody.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdaInImplicitPropertyBody.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdasInWithBodyFunction.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdasInWithBodyFunction.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdasInWithBodyFunction.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/lambdasInWithBodyFunction.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/localClass.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/localClass.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/localClass.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/localClass.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithGetterAndSetter.txt diff --git a/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt b/analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.txt similarity index 100% rename from analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.fir.txt rename to analysis/low-level-api-fir/testdata/innerDeclarationsResolve/propertyWithSetter.txt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt index a8773420418..c57353f7101 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/AbstractInnerDeclarationsResolvePhaseTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -22,7 +22,7 @@ abstract class AbstractInnerDeclarationsResolvePhaseTest : AbstractLowLevelApiSi resolveWithClearCaches(ktFile) { firResolveSession -> val firFile = ktFile.getOrBuildFirOfType(firResolveSession) val actual = FirRenderer.withResolvePhase().renderElementAsString(firFile) - testServices.assertions.assertEqualsToTestDataFileSibling(actual, extension = ".fir.txt") + testServices.assertions.assertEqualsToTestDataFileSibling(actual) } } } @@ -32,5 +32,5 @@ abstract class AbstractSourceInnerDeclarationsResolvePhaseTest : AbstractInnerDe } abstract class AbstractOutOfContentRootInnerDeclarationsResolvePhaseTest : AbstractInnerDeclarationsResolvePhaseTest() { - override val configurator = AnalysisApiFirOutOfContentRootTestConfigurator + override val configurator get() = AnalysisApiFirOutOfContentRootTestConfigurator } \ No newline at end of file