[FIR IDE] Move out-of-block modification trigger to FrontendApiTestConfiguratorService

This commit is contained in:
Yan Zhulanow
2021-10-19 23:07:10 +09:00
committed by teamcityserver
parent 2894f87541
commit b7044803d2
15 changed files with 26 additions and 89 deletions
@@ -45,4 +45,8 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
application.registerService(KotlinReferenceProviderContributor::class.java, KotlinFirReferenceContributor::class.java)
}
}
override fun doOutOfBlockModification(file: KtFile) {
FirLowLevelFrontendApiTestConfiguratorService.doOutOfBlockModification(file)
}
}
@@ -1,17 +0,0 @@
/*
* Copyright 2010-2021 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.
*/
package org.jetbrains.kotlin.analysis.api.fir
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory
import org.jetbrains.kotlin.psi.KtFile
object FirTestWithOutOfBlockModification {
fun doOutOfBlockModification(ktFile: KtFile) {
ServiceManager.getService(ktFile.project, KotlinModificationTrackerFactory::class.java)
.incrementModificationsCount()
}
}
@@ -6,12 +6,6 @@
package org.jetbrains.kotlin.analysis.api.fir.scopes
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest
import org.jetbrains.kotlin.psi.KtFile
abstract class AbstractFirMemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest(FirFrontendApiTestConfiguratorService) {
override fun doOutOfBlockModification(ktFile: KtFile) {
FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
}
abstract class AbstractFirMemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest(FirFrontendApiTestConfiguratorService)
@@ -6,12 +6,6 @@
package org.jetbrains.kotlin.analysis.api.fir.symbols
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest
import org.jetbrains.kotlin.psi.KtFile
abstract class AbstractFirSymbolByFqNameTest : AbstractSymbolByFqNameTest(FirFrontendApiTestConfiguratorService) {
override fun doOutOfBlockModification(ktFile: KtFile) {
FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
}
abstract class AbstractFirSymbolByFqNameTest : AbstractSymbolByFqNameTest(FirFrontendApiTestConfiguratorService)
@@ -6,12 +6,6 @@
package org.jetbrains.kotlin.analysis.api.fir.symbols
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest
import org.jetbrains.kotlin.psi.KtFile
abstract class AbstractFirSymbolByPsiTest : AbstractSymbolByPsiTest(FirFrontendApiTestConfiguratorService) {
override fun doOutOfBlockModification(ktFile: KtFile) {
FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
}
abstract class AbstractFirSymbolByPsiTest : AbstractSymbolByPsiTest(FirFrontendApiTestConfiguratorService)
@@ -6,12 +6,6 @@
package org.jetbrains.kotlin.analysis.api.fir.symbols
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification
import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest
import org.jetbrains.kotlin.psi.KtFile
abstract class AbstractFirSymbolByReferenceTest : AbstractSymbolByReferenceTest(FirFrontendApiTestConfiguratorService) {
override fun doOutOfBlockModification(ktFile: KtFile) {
FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile)
}
}
abstract class AbstractFirSymbolByReferenceTest : AbstractSymbolByReferenceTest(FirFrontendApiTestConfiguratorService)