diff --git a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinGlobalModificationService.kt b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinGlobalModificationService.kt index 98edfb99d99..fcd9f2027ff 100644 --- a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinGlobalModificationService.kt +++ b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/KotlinGlobalModificationService.kt @@ -27,13 +27,6 @@ public abstract class KotlinGlobalModificationService { @TestOnly public abstract fun publishGlobalModuleStateModification() - /** - * Publishes an event of global out-of-block modification of all [KtModule]s. The event does not invalidate module state like - * [publishGlobalModuleStateModification], so some module structure-specific caches might persist. - */ - @TestOnly - public abstract fun publishGlobalOutOfBlockModification() - /** * Publishes an event of global modification of the module state of all source [KtModule]s. */ diff --git a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinGlobalModificationServiceBase.kt b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinGlobalModificationServiceBase.kt index 749834322fb..9aeba416d48 100644 --- a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinGlobalModificationServiceBase.kt +++ b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/impl/KotlinGlobalModificationServiceBase.kt @@ -24,14 +24,6 @@ public abstract class KotlinGlobalModificationServiceBase(private val project: P project.analysisMessageBus.syncPublisher(KotlinTopics.GLOBAL_MODULE_STATE_MODIFICATION).onModification() } - @TestOnly - override fun publishGlobalOutOfBlockModification() { - ApplicationManager.getApplication().assertWriteAccessAllowed() - - incrementModificationTrackers(includeBinaryTrackers = true) - project.analysisMessageBus.syncPublisher(KotlinTopics.GLOBAL_OUT_OF_BLOCK_MODIFICATION).onModification() - } - @TestOnly override fun publishGlobalSourceModuleStateModification() { ApplicationManager.getApplication().assertWriteAccessAllowed() diff --git a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinGlobalOutOfBlockModificationListener.kt b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinGlobalOutOfBlockModificationListener.kt deleted file mode 100644 index 67228b25a3a..00000000000 --- a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinGlobalOutOfBlockModificationListener.kt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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. - */ - -package org.jetbrains.kotlin.analysis.providers.topics - -import org.jetbrains.kotlin.analysis.project.structure.KtModule - -public fun interface KotlinGlobalOutOfBlockModificationListener { - /** - * [onModification] is invoked in a write action before or after global out-of-block modification of all [KtModule]s. - * - * This event is published to invalidate caches during/between tests. - */ - public fun onModification() -} diff --git a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinTopics.kt b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinTopics.kt index aa60ba6b828..cd68d5c6e03 100644 --- a/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinTopics.kt +++ b/analysis/analysis-api-providers/src/org/jetbrains/kotlin/analysis/providers/topics/KotlinTopics.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.analysis.providers.analysisMessageBus * - [KotlinModuleStateModificationListener] * - [KotlinModuleOutOfBlockModificationListener] * - [KotlinGlobalModuleStateModificationListener] - * - [KotlinGlobalOutOfBlockModificationListener] * - [KotlinGlobalSourceModuleStateModificationListener] * - [KotlinGlobalSourceOutOfBlockModificationListener] * @@ -47,9 +46,6 @@ public object KotlinTopics { public val GLOBAL_MODULE_STATE_MODIFICATION: Topic = Topic(KotlinGlobalModuleStateModificationListener::class.java, Topic.BroadcastDirection.TO_CHILDREN, true) - public val GLOBAL_OUT_OF_BLOCK_MODIFICATION: Topic = - Topic(KotlinGlobalOutOfBlockModificationListener::class.java, Topic.BroadcastDirection.TO_CHILDREN, true) - public val GLOBAL_SOURCE_MODULE_STATE_MODIFICATION: Topic = Topic(KotlinGlobalSourceModuleStateModificationListener::class.java, Topic.BroadcastDirection.TO_CHILDREN, true) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidationService.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidationService.kt index 5f8f97d41fe..ba7b7ff016b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidationService.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionInvalidationService.kt @@ -43,10 +43,6 @@ class LLFirSessionInvalidationService(private val project: Project) : Disposable KotlinTopics.GLOBAL_MODULE_STATE_MODIFICATION, KotlinGlobalModuleStateModificationListener { invalidateAll(includeStableModules = true) } ) - busConnection.subscribe( - KotlinTopics.GLOBAL_OUT_OF_BLOCK_MODIFICATION, - KotlinGlobalOutOfBlockModificationListener { invalidateAll(includeStableModules = true) } - ) busConnection.subscribe( KotlinTopics.GLOBAL_SOURCE_MODULE_STATE_MODIFICATION, KotlinGlobalSourceModuleStateModificationListener { invalidateAll(includeStableModules = false) },