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

Fix inspections and slightly "kotlinify" KotlinSuppressCache

Browse Source
This commit is contained in:
Alexander Udalov
2020-11-02 18:48:47 +01:00
committed by Alexander Udalov
parent 9d3c9a823d
commit 61548a0a36
1 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/KotlinSuppressCache.kt
+29 -46
View File
@@ -39,7 +39,7 @@ interface DiagnosticSuppressor {
companion object {
val EP_NAME: ExtensionPointName<DiagnosticSuppressor> =
ExtensionPointName.create<DiagnosticSuppressor>("org.jetbrains.kotlin.diagnosticSuppressor")
ExtensionPointName.create("org.jetbrains.kotlin.diagnosticSuppressor")
}
}
@@ -49,13 +49,13 @@ abstract class KotlinSuppressCache {
// The cache is weak: we're OK with losing it
private val suppressors = ContainerUtil.createConcurrentWeakValueMap<KtAnnotated, Suppressor>()
val filter: (Diagnostic) -> Boolean = { diagnostic: Diagnostic -> !isSuppressed(diagnostic) }
val filter: (Diagnostic) -> Boolean = { diagnostic: Diagnostic ->
!isSuppressed(DiagnosticSuppressRequest(diagnostic))
}
fun isSuppressed(psiElement: PsiElement, suppressionKey: String, severity: Severity) =
isSuppressed(StringSuppressRequest(psiElement, severity, suppressionKey.toLowerCase()))
fun isSuppressed(diagnostic: Diagnostic): Boolean = isSuppressed(DiagnosticSuppressRequest(diagnostic))
private fun isSuppressed(request: SuppressRequest): Boolean {
// If diagnostics are reported in a synthetic file generated by KtPsiFactory (dummy.kt),
// there's no point to present such diagnostics to the user, because the user didn't write this code
@@ -78,7 +78,7 @@ abstract class KotlinSuppressCache {
return isSuppressedByAnnotated(request.suppressKey, request.severity, annotated, 0)
}
open fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {
protected open fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {
return suppressor.isSuppressed(diagnostic)
}
@@ -111,34 +111,30 @@ abstract class KotlinSuppressCache {
This way we need no more lookups than the number of suppress() annotations from here to the root.
*/
protected fun isSuppressedByAnnotated(suppressionKey: String, severity: Severity, annotated: KtAnnotated, debugDepth: Int): Boolean {
private fun isSuppressedByAnnotated(suppressionKey: String, severity: Severity, annotated: KtAnnotated, debugDepth: Int): Boolean {
val suppressor = getOrCreateSuppressor(annotated)
if (suppressor.isSuppressed(suppressionKey, severity)) return true
val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(suppressor.annotatedElement, KtAnnotated::class.java, true) ?: return false
val annotatedAbove = KtStubbedPsiUtil.getPsiOrStubParent(annotated, KtAnnotated::class.java, true) ?: return false
val suppressed = isSuppressedByAnnotated(suppressionKey, severity, annotatedAbove, debugDepth + 1)
val suppressorAbove = suppressors[annotatedAbove]
if (suppressorAbove != null && suppressorAbove.dominates(suppressor)) {
suppressors.put(annotated, suppressorAbove)
suppressors[annotated] = suppressorAbove
}
return suppressed
}
private fun getOrCreateSuppressor(annotated: KtAnnotated): Suppressor {
var suppressor: Suppressor? = suppressors[annotated]
if (suppressor == null) {
private fun getOrCreateSuppressor(annotated: KtAnnotated): Suppressor =
suppressors.getOrPut(annotated) {
val strings = getSuppressingStrings(annotated)
suppressor = when {
strings.isEmpty() -> EmptySuppressor(annotated)
strings.size == 1 -> SingularSuppressor(annotated, strings.iterator().next())
else -> MultiSuppressor(annotated, strings)
when (strings.size) {
0 -> EmptySuppressor
1 -> SingularSuppressor(strings.first())
else -> MultiSuppressor(strings)
}
suppressors.put(annotated, suppressor)
}
return suppressor
}
abstract fun getSuppressionAnnotations(annotated: KtAnnotated): List<AnnotationDescriptor>
@@ -156,7 +152,7 @@ abstract class KotlinSuppressCache {
// We only add strings and skip other values to facilitate recovery in presence of erroneous code
for (arrayValue in annotationDescriptor.allValueArguments.values) {
if ((arrayValue is ArrayValue)) {
if (arrayValue is ArrayValue) {
for (value in arrayValue.value) {
if (value is StringValue) {
builder.add(value.value.toLowerCase())
@@ -167,36 +163,30 @@ abstract class KotlinSuppressCache {
}
companion object {
fun getDiagnosticSuppressKey(diagnostic: Diagnostic): String {
return diagnostic.factory.name.toLowerCase()
}
private fun getDiagnosticSuppressKey(diagnostic: Diagnostic): String =
diagnostic.factory.name.toLowerCase()
fun isSuppressedByStrings(key: String, strings: Set<String>, severity: Severity): Boolean {
if (strings.contains("warnings") && severity == Severity.WARNING) return true
return strings.contains(key)
}
private fun isSuppressedByStrings(key: String, strings: Set<String>, severity: Severity): Boolean =
severity == Severity.WARNING && "warnings" in strings || key in strings
}
private abstract class Suppressor protected constructor(val annotatedElement: KtAnnotated) {
abstract fun isSuppressed(diagnostic: Diagnostic): Boolean
private abstract class Suppressor {
open fun isSuppressed(diagnostic: Diagnostic): Boolean =
isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
abstract fun isSuppressed(suppressionKey: String, severity: Severity): Boolean
// true is \forall x. other.isSuppressed(x) -> this.isSuppressed(x)
abstract fun dominates(other: Suppressor): Boolean
}
private class EmptySuppressor(annotated: KtAnnotated) : Suppressor(annotated) {
private object EmptySuppressor : Suppressor() {
override fun isSuppressed(diagnostic: Diagnostic): Boolean = false
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean = false
override fun dominates(other: Suppressor): Boolean = other is EmptySuppressor
override fun dominates(other: Suppressor): Boolean = this === other
}
private class SingularSuppressor(annotated: KtAnnotated, private val string: String) : Suppressor(annotated) {
override fun isSuppressed(diagnostic: Diagnostic): Boolean {
return isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
}
private class SingularSuppressor(private val string: String) : Suppressor() {
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
return isSuppressedByStrings(suppressionKey, ImmutableSet.of(string), severity)
}
@@ -206,11 +196,7 @@ abstract class KotlinSuppressCache {
}
}
private class MultiSuppressor(annotated: KtAnnotated, private val strings: Set<String>) : Suppressor(annotated) {
override fun isSuppressed(diagnostic: Diagnostic): Boolean {
return isSuppressed(getDiagnosticSuppressKey(diagnostic), diagnostic.severity)
}
private class MultiSuppressor(private val strings: Set<String>) : Suppressor() {
override fun isSuppressed(suppressionKey: String, severity: Severity): Boolean {
return isSuppressedByStrings(suppressionKey, strings, severity)
}
@@ -244,11 +230,8 @@ class BindingContextSuppressCache(val context: BindingContext) : KotlinSuppressC
override fun getSuppressionAnnotations(annotated: KtAnnotated): List<AnnotationDescriptor> {
val descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotated)
return if (descriptor != null) {
descriptor.annotations.toList()
} else {
annotated.annotationEntries.mapNotNull { context.get(BindingContext.ANNOTATION, it) }
}
return descriptor?.annotations?.toList()
?: annotated.annotationEntries.mapNotNull { context.get(BindingContext.ANNOTATION, it) }
}
override fun isSuppressedByExtension(suppressor: DiagnosticSuppressor, diagnostic: Diagnostic): Boolean {