azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR IDE: fix tests compilation

Browse Source
This commit is contained in:
Ilya Kirillov
2020-09-23 19:33:42 +03:00
parent f36cd28696
commit 347a984ce0
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/structure/FileStructure.kt
+1 -1
View File
@@ -111,7 +111,7 @@ internal class FileStructure(
} }
private fun createDeclarationStructure(declaration: KtDeclaration): FileStructureElement { private fun createDeclarationStructure(declaration: KtDeclaration): FileStructureElement {
val firDeclaration = declaration.findSourceNonLocalFirDeclaration(firFileBuilder, firIdeProvider, moduleFileCache) val firDeclaration = declaration.findSourceNonLocalFirDeclaration(firFileBuilder, firIdeProvider.symbolProvider, moduleFileCache)
firLazyDeclarationResolver.lazyResolveDeclaration( firLazyDeclarationResolver.lazyResolveDeclaration(
firDeclaration, firDeclaration,
moduleFileCache, moduleFileCache,
idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyResolveTest.kt
+3 -3
View File
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.render
import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo 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.fir.low.level.api.providers.firIdeProvider
import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.jsonUtils.getString
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
@@ -66,8 +66,8 @@ abstract class AbstractFirLazyResolveTest : KotlinLightCodeInsightFixtureTestCas
else -> elementToResolve else -> elementToResolve
} as KtExpression } as KtExpression
val resolveState = expressionToResolve.firResolveState() val resolveState = LowLevelFirApiFacade.getResolveStateFor(expressionToResolve)
val resultsDump = when (val firElement = resolveState.getOrBuildFirFor(expressionToResolve, FirResolvePhase.BODY_RESOLVE)) { val resultsDump = when (val firElement = resolveState.getOrBuildFirFor(expressionToResolve)) {
is FirResolvedImport -> buildString { is FirResolvedImport -> buildString {
append("import ") append("import ")
append(firElement.packageFqName) append(firElement.packageFqName)
idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirMultiModuleLazyResolveTest.kt
+1 -1
View File
@@ -43,7 +43,7 @@ abstract class AbstractFirMultiModuleLazyResolveTest : AbstractMultiModuleTest()
val fails = testStructure.fails val fails = testStructure.fails
try { try {
val fir = LowLevelFirApiFacade.getOrBuildFirFor(ktFileToAnalyse, resolveState, FirResolvePhase.BODY_RESOLVE) val fir = LowLevelFirApiFacade.getOrBuildFirFor(ktFileToAnalyse, resolveState)
KotlinTestUtils.assertEqualsToFile(File("$path/expected.txt"), fir.render()) KotlinTestUtils.assertEqualsToFile(File("$path/expected.txt"), fir.render())
} catch (e: Throwable) { } catch (e: Throwable) {
if (!fails) throw e if (!fails) throw e
idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirResolveStateTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.fir.low.level.api package org.jetbrains.kotlin.idea.fir.low.level.api
import org.jetbrains.kotlin.idea.AbstractResolveElementCacheTest 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() { class FirResolveStateTest : AbstractResolveElementCacheTest() {
override fun isFirPlugin(): Boolean = true override fun isFirPlugin(): Boolean = true
@@ -15,7 +15,7 @@ class FirResolveStateTest : AbstractResolveElementCacheTest() {
doTest { doTest {
val firstStatement = statements[0] val firstStatement = statements[0]
val secondStatement = statements[1] val secondStatement = statements[1]
assertSame(firstStatement.firResolveState(), secondStatement.firResolveState()) assertSame(LowLevelFirApiFacade.getResolveStateFor(firstStatement), LowLevelFirApiFacade.getResolveStateFor(secondStatement))
} }
} }
} }
idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/AbstractKtDeclarationAndFirDeclarationEqualityChecker.kt
+1 -1
View File
@@ -21,7 +21,7 @@ abstract class AbstractKtDeclarationAndFirDeclarationEqualityChecker : KotlinLig
val ktFile = myFixture.configureByText(file.name, FileUtil.loadFile(file)) as KtFile val ktFile = myFixture.configureByText(file.name, FileUtil.loadFile(file)) as KtFile
val resolveState = LowLevelFirApiFacade.getResolveStateFor(ktFile) val resolveState = LowLevelFirApiFacade.getResolveStateFor(ktFile)
ktFile.forEachDescendantOfType<KtFunction> { ktFunction -> ktFile.forEachDescendantOfType<KtFunction> { ktFunction ->
val firFunction = ktFunction.getOrBuildFir(resolveState) as FirFunction<*> val firFunction = LowLevelFirApiFacade.getOrBuildFirFor(ktFunction, resolveState) as FirFunction<*>
if (!KtDeclarationAndFirDeclarationEqualityChecker.representsTheSameDeclaration(ktFunction, firFunction)) { if (!KtDeclarationAndFirDeclarationEqualityChecker.representsTheSameDeclaration(ktFunction, firFunction)) {
throw FileComparisonFailure( throw FileComparisonFailure(
/* message= */ null, /* message= */ null,