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

Fix onTheFlyDiagnosticsCallback

Browse Source 
KtNamedFunction, KtClass etc are KtAnnotated.
Annotation recursion could happen within onTheFlyDiagnosticsCallback if
KtAnnotated has some annotations.

#KTIJ-25219

Merge-request: KT-MR-9652
Merged-by: Vladimir Dolzhenko <Vladimir.Dolzhenko@jetbrains.com>
This commit is contained in:
Vladimir Dolzhenko
2023-04-18 19:44:00 +00:00
committed by Space Team
parent cd9924dafe
commit e10e821cd4
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
+16 -8
View File
@@ -16,9 +16,9 @@
package org.jetbrains.kotlin.resolve.diagnostics package org.jetbrains.kotlin.resolve.diagnostics
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.util.CompositeModificationTracker import com.intellij.openapi.util.CompositeModificationTracker
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.CachedValueProvider
import com.intellij.util.CachedValueImpl import com.intellij.util.CachedValueImpl
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
@@ -32,6 +32,7 @@ class MutableDiagnosticsWithSuppression(
private val delegateDiagnostics: Diagnostics, private val delegateDiagnostics: Diagnostics,
) : Diagnostics { ) : Diagnostics {
private val diagnosticList = ArrayList<Diagnostic>() private val diagnosticList = ArrayList<Diagnostic>()
@Volatile @Volatile
private var diagnosticsCallback: DiagnosticSink.DiagnosticsCallback? = null private var diagnosticsCallback: DiagnosticSink.DiagnosticsCallback? = null
@@ -74,14 +75,21 @@ class MutableDiagnosticsWithSuppression(
modificationTracker.incModificationCount() modificationTracker.incModificationCount()
} }
private fun onTheFlyDiagnosticsCallback(diagnostic: Diagnostic): DiagnosticSink.DiagnosticsCallback? = private fun onTheFlyDiagnosticsCallback(diagnostic: Diagnostic): DiagnosticSink.DiagnosticsCallback? {
diagnosticsCallback.takeIf { val callback = diagnosticsCallback ?: return null
diagnosticsCallback != null && // Due to a potential recursion in filter.invoke (via LazyAnnotations) do not try to report
// Due to a potential recursion in filter.invoke (via LazyAnnotations) do not try to report // diagnostic on-the-fly if it happened in annotations, and do not report any potentially suppressed elements
// diagnostic on-the-fly if it happened in annotations, and do not report any potentially suppressed elements var element: PsiElement? = diagnostic.psiElement
KtStubbedPsiUtil.getPsiOrStubParent(diagnostic.psiElement, KtAnnotated::class.java, false) == null && while (element != null && element !is PsiFile) {
suppressCache.filter.invoke(diagnostic) val annotated = KtStubbedPsiUtil.getPsiOrStubParent(element, KtAnnotated::class.java, false)
val annotationEntries = annotated?.annotationEntries
if (annotationEntries?.isNotEmpty() == true) return null
element = annotated?.parent
} }
val filtered = suppressCache.filter.invoke(diagnostic)
if (!filtered) return null
return callback
}
fun clear() { fun clear() {
diagnosticList.clear() diagnosticList.clear()