MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Replace LLFirDeclarationModificationService with KaSourceModificationService

Browse Source 
^KT-69436

GitOrigin-RevId: 5612f8082f322e8f65f5e235e2c83356879a5109
This commit is contained in:
Marco Pennekamp
2024-07-18 11:29:34 +02:00
committed by intellij-monorepo-bot
parent 3c08043342
commit 1ffec2b287
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/fir/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/FirIdeOutOfBlockPsiTreeChangePreprocessor.kt
+16 -19
View File
@@ -12,11 +12,10 @@ import com.intellij.psi.impl.PsiTreeChangePreprocessor
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtilBase
import com.intellij.psi.util.parentOfType
import org.jetbrains.kotlin.analysis.api.platform.analysisMessageBus
import org.jetbrains.kotlin.analysis.api.platform.modification.KaElementModificationType
import org.jetbrains.kotlin.analysis.api.platform.modification.KaSourceModificationService
import org.jetbrains.kotlin.analysis.api.platform.modification.KotlinModificationTopics
import org.jetbrains.kotlin.analysis.api.platform.projectStructure.KotlinProjectStructureProvider
import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirInternals
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.LLFirDeclarationModificationService
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.LLFirDeclarationModificationService.ModificationType
import org.jetbrains.kotlin.idea.util.publishGlobalSourceOutOfBlockModification
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment
@@ -56,22 +55,20 @@ internal class FirIdeOutOfBlockPsiTreeChangePreprocessor(private val project: Pr
return
}
@OptIn(LLFirInternals::class)
LLFirDeclarationModificationService.getInstance(project).elementModified(
element = child ?: rootElement,
modificationType = when (event.code) {
PsiEventType.CHILD_ADDED -> ModificationType.ElementAdded
PsiEventType.CHILD_REMOVED -> {
val removedElement = event.child ?:
errorWithAttachment("A ${PsiEventType.CHILD_REMOVED} PSI tree change event should have a child element") {
withEntry("psiTreeChangeEvent", event.toString())
withPsiEntry("rootElement", rootElement)
}
ModificationType.ElementRemoved(removedElement)
}
else -> ModificationType.Unknown
},
)
val modificationType = when (event.code) {
PsiEventType.CHILD_ADDED -> KaElementModificationType.ElementAdded
PsiEventType.CHILD_REMOVED -> {
val removedElement = event.child ?:
errorWithAttachment("A ${PsiEventType.CHILD_REMOVED} PSI tree change event should have a child element") {
withEntry("psiTreeChangeEvent", event.toString())
withPsiEntry("rootElement", rootElement)
}
KaElementModificationType.ElementRemoved(removedElement)
}
else -> KaElementModificationType.Unknown
}
KaSourceModificationService.getInstance(project).handleElementModification(child ?: rootElement, modificationType)
}
private fun invalidateCachesInInjectedDocuments(rootElement: PsiElement) {
plugins/kotlin/base/fir/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/fir/analysisApiPlatform/KotlinChangeLocalityDetector.kt
+3 -4
View File
@@ -3,14 +3,13 @@ package org.jetbrains.kotlin.idea.base.fir.analysisApiPlatform
import com.intellij.codeInsight.daemon.ChangeLocalityDetector
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirInternals
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.LLFirDeclarationModificationService
import org.jetbrains.kotlin.analysis.api.platform.modification.KaSourceModificationService
// Note: The K2 change locality detector is currently unused due to missing logic in `KotlinDiagnosticHighlightingVisitor`. See KTIJ-26691.
internal class KotlinChangeLocalityDetector : ChangeLocalityDetector {
override fun getChangeHighlightingDirtyScopeFor(changedElement: PsiElement): PsiElement? {
// we shouldn't process comments here because the default detector will do that for us
@OptIn(LLFirInternals::class)
return LLFirDeclarationModificationService.getInstance(changedElement.project).elementToRehighlight(changedElement)
return KaSourceModificationService.getInstance(changedElement.project).ancestorAffectedByInBlockModification(changedElement)
}
}