From 347a984ce09bdaa13626dfe9e139fcb29d882d10 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 23 Sep 2020 19:33:42 +0300 Subject: [PATCH] FIR IDE: fix tests compilation --- .../idea/fir/low/level/api/file/structure/FileStructure.kt | 2 +- .../idea/fir/low/level/api/AbstractFirLazyResolveTest.kt | 6 +++--- .../low/level/api/AbstractFirMultiModuleLazyResolveTest.kt | 2 +- .../kotlin/idea/fir/low/level/api/FirResolveStateTest.kt | 4 ++-- ...AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt index 73e78136a33..96b6cb1c8b6 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt @@ -111,7 +111,7 @@ internal class FileStructure( } private fun createDeclarationStructure(declaration: KtDeclaration): FileStructureElement { - val firDeclaration = declaration.findSourceNonLocalFirDeclaration(firFileBuilder, firIdeProvider, moduleFileCache) + val firDeclaration = declaration.findSourceNonLocalFirDeclaration(firFileBuilder, firIdeProvider.symbolProvider, moduleFileCache) firLazyDeclarationResolver.lazyResolveDeclaration( firDeclaration, moduleFileCache, diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyResolveTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyResolveTest.kt index b0239a40af5..9eb757d2a94 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyResolveTest.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyResolveTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo -import org.jetbrains.kotlin.idea.fir.low.level.api.api.firResolveState +import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade import org.jetbrains.kotlin.idea.fir.low.level.api.providers.firIdeProvider import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase @@ -66,8 +66,8 @@ abstract class AbstractFirLazyResolveTest : KotlinLightCodeInsightFixtureTestCas else -> elementToResolve } as KtExpression - val resolveState = expressionToResolve.firResolveState() - val resultsDump = when (val firElement = resolveState.getOrBuildFirFor(expressionToResolve, FirResolvePhase.BODY_RESOLVE)) { + val resolveState = LowLevelFirApiFacade.getResolveStateFor(expressionToResolve) + val resultsDump = when (val firElement = resolveState.getOrBuildFirFor(expressionToResolve)) { is FirResolvedImport -> buildString { append("import ") append(firElement.packageFqName) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleLazyResolveTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleLazyResolveTest.kt index 89cd1f8d927..4b21fddece5 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleLazyResolveTest.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleLazyResolveTest.kt @@ -43,7 +43,7 @@ abstract class AbstractFirMultiModuleLazyResolveTest : AbstractMultiModuleTest() val fails = testStructure.fails try { - val fir = LowLevelFirApiFacade.getOrBuildFirFor(ktFileToAnalyse, resolveState, FirResolvePhase.BODY_RESOLVE) + val fir = LowLevelFirApiFacade.getOrBuildFirFor(ktFileToAnalyse, resolveState) KotlinTestUtils.assertEqualsToFile(File("$path/expected.txt"), fir.render()) } catch (e: Throwable) { if (!fails) throw e diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirResolveStateTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirResolveStateTest.kt index 870f5d94e1c..3c8cb22df37 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirResolveStateTest.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirResolveStateTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.fir.low.level.api import org.jetbrains.kotlin.idea.AbstractResolveElementCacheTest -import org.jetbrains.kotlin.idea.fir.low.level.api.api.firResolveState +import org.jetbrains.kotlin.idea.fir.low.level.api.api.LowLevelFirApiFacade class FirResolveStateTest : AbstractResolveElementCacheTest() { override fun isFirPlugin(): Boolean = true @@ -15,7 +15,7 @@ class FirResolveStateTest : AbstractResolveElementCacheTest() { doTest { val firstStatement = statements[0] val secondStatement = statements[1] - assertSame(firstStatement.firResolveState(), secondStatement.firResolveState()) + assertSame(LowLevelFirApiFacade.getResolveStateFor(firstStatement), LowLevelFirApiFacade.getResolveStateFor(secondStatement)) } } } \ No newline at end of file diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt index 0cdd4ca78ee..ed32098fb60 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt @@ -21,7 +21,7 @@ abstract class AbstractKtDeclarationAndFirDeclarationEqualityChecker : KotlinLig val ktFile = myFixture.configureByText(file.name, FileUtil.loadFile(file)) as KtFile val resolveState = LowLevelFirApiFacade.getResolveStateFor(ktFile) ktFile.forEachDescendantOfType { ktFunction -> - val firFunction = ktFunction.getOrBuildFir(resolveState) as FirFunction<*> + val firFunction = LowLevelFirApiFacade.getOrBuildFirFor(ktFunction, resolveState) as FirFunction<*> if (!KtDeclarationAndFirDeclarationEqualityChecker.representsTheSameDeclaration(ktFunction, firFunction)) { throw FileComparisonFailure( /* message= */ null,