FIR: remove unused diagnsotics

These diagnostics do not exist in FE1.0 and they are not used
anywhere.
This commit is contained in:
Tianyu Geng
2021-06-08 11:17:48 -07:00
committed by Mikhail Glukhikh
parent 3b513ba299
commit bea90e0578
8 changed files with 0 additions and 67 deletions
@@ -97,7 +97,6 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
val UNRESOLVED_LABEL by error<PsiElement>()
val DESERIALIZATION_ERROR by error<PsiElement>()
val ERROR_FROM_JAVA_RESOLUTION by error<PsiElement>()
val UNKNOWN_CALLABLE_KIND by error<PsiElement>()
val MISSING_STDLIB_CLASS by error<PsiElement>()
val NO_THIS by error<PsiElement>()
@@ -131,8 +130,6 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
}
val SUPERTYPES by object : DiagnosticGroup("Supertypes") {
val ENUM_AS_SUPERTYPE by error<PsiElement>()
val RECURSION_IN_SUPERTYPES by error<PsiElement>()
val NOT_A_SUPERTYPE by error<PsiElement>()
val SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE by error<PsiElement>()
val QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE by error<KtTypeReference> {
@@ -120,7 +120,6 @@ object FirErrors {
val UNRESOLVED_LABEL by error0<PsiElement>()
val DESERIALIZATION_ERROR by error0<PsiElement>()
val ERROR_FROM_JAVA_RESOLUTION by error0<PsiElement>()
val UNKNOWN_CALLABLE_KIND by error0<PsiElement>()
val MISSING_STDLIB_CLASS by error0<PsiElement>()
val NO_THIS by error0<PsiElement>()
val DEPRECATION_ERROR by error2<PsiElement, FirBasedSymbol<*>, String>(SourceElementPositioningStrategies.REFERENCED_NAME_BY_QUALIFIED)
@@ -138,8 +137,6 @@ object FirErrors {
val INSTANCE_ACCESS_BEFORE_SUPER_CALL by error1<PsiElement, String>()
// Supertypes
val ENUM_AS_SUPERTYPE by error0<PsiElement>()
val RECURSION_IN_SUPERTYPES by error0<PsiElement>()
val NOT_A_SUPERTYPE by error0<PsiElement>()
val SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE by error0<PsiElement>()
val QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE by error1<KtTypeReference, FirBasedSymbol<*>>()
@@ -131,7 +131,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DEPRECATION_ERROR
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DESERIALIZATION_ERROR
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DYNAMIC_UPPER_BOUND
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EMPTY_RANGE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ENUM_AS_SUPERTYPE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EQUALITY_NOT_APPLICABLE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EQUALITY_NOT_APPLICABLE_WARNING
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ERROR_FROM_JAVA_RESOLUTION
@@ -305,7 +304,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.PROTECTED_CONSTRU
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSION_IN_IMPLICIT_TYPES
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSION_IN_INLINE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSION_IN_SUPERTYPES
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSIVE_TYPEALIAS_EXPANSION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.REDECLARATION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.REDUNDANT_ANNOTATION_TARGET
@@ -491,8 +489,6 @@ class FirDefaultErrorMessages {
map.put(ILLEGAL_SELECTOR, "The expression cannot be a selector (occur after a dot)")
// Supertypes
map.put(ENUM_AS_SUPERTYPE, "Enum as supertype")
map.put(RECURSION_IN_SUPERTYPES, "Recursion in supertypes")
map.put(NOT_A_SUPERTYPE, "Not an immediate supertype")
map.put(SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE, "Superclass is not accessible from interface")
map.put(
@@ -333,8 +333,6 @@ private fun ConeSimpleDiagnostic.getFactory(source: FirSourceElement): FirDiagno
DiagnosticKind.IllegalUnderscore -> FirErrors.ILLEGAL_UNDERSCORE
DiagnosticKind.DeserializationError -> FirErrors.DESERIALIZATION_ERROR
DiagnosticKind.InferenceError -> FirErrors.INFERENCE_ERROR
DiagnosticKind.EnumAsSupertype -> FirErrors.ENUM_AS_SUPERTYPE
DiagnosticKind.RecursionInSupertypes -> FirErrors.RECURSION_IN_SUPERTYPES
DiagnosticKind.RecursionInImplicitTypes -> FirErrors.RECURSION_IN_IMPLICIT_TYPES
DiagnosticKind.Java -> FirErrors.ERROR_FROM_JAVA_RESOLUTION
DiagnosticKind.SuperNotAllowed -> FirErrors.SUPER_IS_NOT_AN_EXPRESSION
@@ -349,7 +347,6 @@ private fun ConeSimpleDiagnostic.getFactory(source: FirSourceElement): FirDiagno
DiagnosticKind.VariableExpected -> FirErrors.VARIABLE_EXPECTED
DiagnosticKind.ValueParameterWithNoTypeAnnotation -> FirErrors.VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION
DiagnosticKind.CannotInferParameterType -> FirErrors.CANNOT_INFER_PARAMETER_TYPE
DiagnosticKind.UnknownCallableKind -> FirErrors.UNKNOWN_CALLABLE_KIND
DiagnosticKind.IllegalProjectionUsage -> FirErrors.ILLEGAL_PROJECTION_USAGE
DiagnosticKind.MissingStdlibClass -> FirErrors.MISSING_STDLIB_CLASS
DiagnosticKind.IntLiteralOutOfRange -> FirErrors.INT_LITERAL_OUT_OF_RANGE
@@ -26,14 +26,11 @@ enum class DiagnosticKind {
IllegalUnderscore,
DeserializationError,
InferenceError,
EnumAsSupertype,
RecursionInSupertypes,
RecursionInImplicitTypes,
Java,
SuperNotAllowed,
ValueParameterWithNoTypeAnnotation,
CannotInferParameterType,
UnknownCallableKind,
IllegalProjectionUsage,
MissingStdlibClass,
@@ -265,12 +265,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.UNKNOWN_CALLABLE_KIND) { firDiagnostic ->
UnknownCallableKindImpl(
firDiagnostic as FirPsiDiagnostic,
token,
)
}
add(FirErrors.MISSING_STDLIB_CLASS) { firDiagnostic ->
MissingStdlibClassImpl(
firDiagnostic as FirPsiDiagnostic,
@@ -344,18 +338,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.ENUM_AS_SUPERTYPE) { firDiagnostic ->
EnumAsSupertypeImpl(
firDiagnostic as FirPsiDiagnostic,
token,
)
}
add(FirErrors.RECURSION_IN_SUPERTYPES) { firDiagnostic ->
RecursionInSupertypesImpl(
firDiagnostic as FirPsiDiagnostic,
token,
)
}
add(FirErrors.NOT_A_SUPERTYPE) { firDiagnostic ->
NotASupertypeImpl(
firDiagnostic as FirPsiDiagnostic,
@@ -213,10 +213,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = ErrorFromJavaResolution::class
}
abstract class UnknownCallableKind : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = UnknownCallableKind::class
}
abstract class MissingStdlibClass : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = MissingStdlibClass::class
}
@@ -268,14 +264,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract val target: String
}
abstract class EnumAsSupertype : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = EnumAsSupertype::class
}
abstract class RecursionInSupertypes : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = RecursionInSupertypes::class
}
abstract class NotASupertype : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = NotASupertype::class
}
@@ -310,13 +310,6 @@ internal class ErrorFromJavaResolutionImpl(
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class UnknownCallableKindImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.UnknownCallableKind(), KtAbstractFirDiagnostic<PsiElement> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class MissingStdlibClassImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
@@ -401,20 +394,6 @@ internal class InstanceAccessBeforeSuperCallImpl(
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class EnumAsSupertypeImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.EnumAsSupertype(), KtAbstractFirDiagnostic<PsiElement> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class RecursionInSupertypesImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.RecursionInSupertypes(), KtAbstractFirDiagnostic<PsiElement> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class NotASupertypeImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,