FIR: remove unused copy of CONFLICTING_JVM_DECLARATIONS
It was added as a placeholder in f3c58a1df7 and was not used anywhere.
The used error is declared in `JvmBackendErrors` and is reported by the
backend.
This commit is contained in:
committed by
Space Team
parent
196f14823e
commit
731a1dd98d
-6
@@ -4919,12 +4919,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
|
|||||||
token,
|
token,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
add(FirJvmErrors.CONFLICTING_JVM_DECLARATIONS) { firDiagnostic ->
|
|
||||||
ConflictingJvmDeclarationsImpl(
|
|
||||||
firDiagnostic as KtPsiDiagnostic,
|
|
||||||
token,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
add(FirJvmErrors.OVERRIDE_CANNOT_BE_STATIC) { firDiagnostic ->
|
add(FirJvmErrors.OVERRIDE_CANNOT_BE_STATIC) { firDiagnostic ->
|
||||||
OverrideCannotBeStaticImpl(
|
OverrideCannotBeStaticImpl(
|
||||||
firDiagnostic as KtPsiDiagnostic,
|
firDiagnostic as KtPsiDiagnostic,
|
||||||
|
|||||||
-4
@@ -3425,10 +3425,6 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
|
|||||||
val presentableString: String
|
val presentableString: String
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ConflictingJvmDeclarations : KtFirDiagnostic<PsiElement> {
|
|
||||||
override val diagnosticClass get() = ConflictingJvmDeclarations::class
|
|
||||||
}
|
|
||||||
|
|
||||||
interface OverrideCannotBeStatic : KtFirDiagnostic<PsiElement> {
|
interface OverrideCannotBeStatic : KtFirDiagnostic<PsiElement> {
|
||||||
override val diagnosticClass get() = OverrideCannotBeStatic::class
|
override val diagnosticClass get() = OverrideCannotBeStatic::class
|
||||||
}
|
}
|
||||||
|
|||||||
-5
@@ -4130,11 +4130,6 @@ internal class PreReleaseClassImpl(
|
|||||||
token: KtLifetimeToken,
|
token: KtLifetimeToken,
|
||||||
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.PreReleaseClass
|
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.PreReleaseClass
|
||||||
|
|
||||||
internal class ConflictingJvmDeclarationsImpl(
|
|
||||||
firDiagnostic: KtPsiDiagnostic,
|
|
||||||
token: KtLifetimeToken,
|
|
||||||
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.ConflictingJvmDeclarations
|
|
||||||
|
|
||||||
internal class OverrideCannotBeStaticImpl(
|
internal class OverrideCannotBeStaticImpl(
|
||||||
firDiagnostic: KtPsiDiagnostic,
|
firDiagnostic: KtPsiDiagnostic,
|
||||||
token: KtLifetimeToken,
|
token: KtLifetimeToken,
|
||||||
|
|||||||
-2
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.util.PrivateForInline
|
|||||||
@OptIn(PrivateForInline::class)
|
@OptIn(PrivateForInline::class)
|
||||||
object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
|
object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
|
||||||
val DECLARATIONS by object : DiagnosticGroup("Declarations") {
|
val DECLARATIONS by object : DiagnosticGroup("Declarations") {
|
||||||
val CONFLICTING_JVM_DECLARATIONS by error<PsiElement>()
|
|
||||||
|
|
||||||
val OVERRIDE_CANNOT_BE_STATIC by error<PsiElement>()
|
val OVERRIDE_CANNOT_BE_STATIC by error<PsiElement>()
|
||||||
val JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE)
|
val JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE)
|
||||||
val JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE)
|
val JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE)
|
||||||
|
|||||||
-1
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.psi.KtExpression
|
|||||||
|
|
||||||
object FirJvmErrors {
|
object FirJvmErrors {
|
||||||
// Declarations
|
// Declarations
|
||||||
val CONFLICTING_JVM_DECLARATIONS by error0<PsiElement>()
|
|
||||||
val OVERRIDE_CANNOT_BE_STATIC by error0<PsiElement>()
|
val OVERRIDE_CANNOT_BE_STATIC by error0<PsiElement>()
|
||||||
val JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION by error0<PsiElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
val JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION by error0<PsiElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
||||||
val JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION by error0<PsiElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
val JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION by error0<PsiElement>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
||||||
|
|||||||
-4
@@ -5,16 +5,13 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.analysis.diagnostics.jvm
|
package org.jetbrains.kotlin.fir.analysis.diagnostics.jvm
|
||||||
|
|
||||||
import com.intellij.openapi.util.io.FileUtil
|
|
||||||
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap
|
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap
|
||||||
import org.jetbrains.kotlin.diagnostics.KtDiagnosticRenderers.TO_STRING
|
import org.jetbrains.kotlin.diagnostics.KtDiagnosticRenderers.TO_STRING
|
||||||
import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
|
import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
|
||||||
import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.STRING
|
import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.STRING
|
||||||
import org.jetbrains.kotlin.diagnostics.rendering.Renderer
|
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.DECLARATION_NAME
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.DECLARATION_NAME
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_TYPE
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_TYPE
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.CONFLICTING_JVM_DECLARATIONS
|
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DELEGATION_BY_IN_JVM_RECORD
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DELEGATION_BY_IN_JVM_RECORD
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DEPRECATED_JAVA_ANNOTATION
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DEPRECATED_JAVA_ANNOTATION
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.ENUM_JVM_RECORD
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.ENUM_JVM_RECORD
|
||||||
@@ -84,7 +81,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.VALUE_CLAS
|
|||||||
object FirJvmErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
object FirJvmErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
|
||||||
|
|
||||||
override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map ->
|
override val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map ->
|
||||||
map.put(CONFLICTING_JVM_DECLARATIONS, "Platform declaration clash.")
|
|
||||||
map.put(JAVA_TYPE_MISMATCH, "Java type mismatch: expected ''{0}'' but found ''{1}''. Use explicit cast.", RENDER_TYPE, RENDER_TYPE)
|
map.put(JAVA_TYPE_MISMATCH, "Java type mismatch: expected ''{0}'' but found ''{1}''. Use explicit cast.", RENDER_TYPE, RENDER_TYPE)
|
||||||
map.put(UPPER_BOUND_CANNOT_BE_ARRAY, "Upper bound of type parameter cannot be an array.")
|
map.put(UPPER_BOUND_CANNOT_BE_ARRAY, "Upper bound of type parameter cannot be an array.")
|
||||||
map.put(STRICTFP_ON_CLASS, "'@Strictfp' annotation on classes is not yet supported.")
|
map.put(STRICTFP_ON_CLASS, "'@Strictfp' annotation on classes is not yet supported.")
|
||||||
|
|||||||
-1
@@ -568,7 +568,6 @@ val FIR_NON_SUPPRESSIBLE_ERROR_NAMES: Set<String> = setOf(
|
|||||||
"MIXING_FUNCTIONAL_KINDS_IN_SUPERTYPES",
|
"MIXING_FUNCTIONAL_KINDS_IN_SUPERTYPES",
|
||||||
"INCOMPATIBLE_CLASS",
|
"INCOMPATIBLE_CLASS",
|
||||||
"PRE_RELEASE_CLASS",
|
"PRE_RELEASE_CLASS",
|
||||||
"CONFLICTING_JVM_DECLARATIONS",
|
|
||||||
"OVERRIDE_CANNOT_BE_STATIC",
|
"OVERRIDE_CANNOT_BE_STATIC",
|
||||||
"JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION",
|
"JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION",
|
||||||
"JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION",
|
"JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION",
|
||||||
|
|||||||
-1
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.resolve.MemberComparator
|
|||||||
import org.jetbrains.kotlin.utils.join
|
import org.jetbrains.kotlin.utils.join
|
||||||
|
|
||||||
object JvmBackendErrors {
|
object JvmBackendErrors {
|
||||||
// TODO: slightly different errors of this type exist also in fir checkers, consider unifying
|
|
||||||
val CONFLICTING_JVM_DECLARATIONS by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
val CONFLICTING_JVM_DECLARATIONS by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val CONFLICTING_INHERITED_JVM_DECLARATIONS by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
val CONFLICTING_INHERITED_JVM_DECLARATIONS by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
val ACCIDENTAL_OVERRIDE by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
val ACCIDENTAL_OVERRIDE by error1<PsiElement, ConflictingJvmDeclarationsData>(DECLARATION_SIGNATURE_OR_DEFAULT)
|
||||||
|
|||||||
Reference in New Issue
Block a user