MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Don't display empty action "Inspection 'Kotlin compiler error' options"

Browse Source 
There are no options for an error. Unlike a warning, it cannot be suppressed (KTIJ-14149).

^KTIJ-22646 Fixed

GitOrigin-RevId: 4cbb7b2f2f281c0ba1a46c3f98150df0b2e4212a
This commit is contained in:
Alexey Belkov
2022-09-13 17:08:52 +04:00
committed by intellij-monorepo-bot
parent 25c193ccd6
commit cf38c940ef
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/kotlin/base/fe10/highlighting/src/org/jetbrains/kotlin/idea/highlighter/AnnotationPresentationInfo.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.highlighter
@@ -33,7 +33,6 @@ class AnnotationPresentationInfo(
) {
companion object {
private const val KOTLIN_COMPILER_WARNING_ID = "KotlinCompilerWarningOptions"
private const val KOTLIN_COMPILER_ERROR_ID = "KotlinCompilerErrorOptions"
}
fun processDiagnostics(
@@ -66,22 +65,18 @@ class AnnotationPresentationInfo(
diagnostic: Diagnostic,
info: HighlightInfo
) {
val warning = diagnostic.severity == Severity.WARNING
val error = diagnostic.severity == Severity.ERROR
val isWarning = diagnostic.severity == Severity.WARNING
val isError = diagnostic.severity == Severity.ERROR
val fixes = quickFixes[diagnostic].takeIf { it.isNotEmpty() }
?: if (warning) listOf(CompilerWarningIntentionAction(diagnostic.factory.name)) else emptyList()
?: if (isWarning) listOf(CompilerWarningIntentionAction(diagnostic.factory.name)) else emptyList()
val keyForSuppressOptions = when {
error -> HighlightDisplayKey.findOrRegister(
KOTLIN_COMPILER_ERROR_ID,
KotlinBaseFe10HighlightingBundle.message("kotlin.compiler.error")
)
else -> HighlightDisplayKey.findOrRegister(
val keyForSuppressOptions = if (isWarning) {
HighlightDisplayKey.findOrRegister(
KOTLIN_COMPILER_WARNING_ID,
KotlinBaseFe10HighlightingBundle.message("kotlin.compiler.warning")
)
}
} else null
for (fix in fixes) {
if (fix !is IntentionAction) {
@@ -99,7 +94,7 @@ class AnnotationPresentationInfo(
options += problemGroup.getSuppressActions(diagnostic.psiElement).mapNotNull { it as IntentionAction }
}
val message = KotlinBaseFe10HighlightingBundle.message(if (error) "kotlin.compiler.error" else "kotlin.compiler.warning")
val message = KotlinBaseFe10HighlightingBundle.message(if (isError) "kotlin.compiler.error" else "kotlin.compiler.warning")
info.registerFix(fix, options, message, null, keyForSuppressOptions)
}
}