diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt index bd5eeb944cd..4a154518f0c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt @@ -93,7 +93,7 @@ class ErrorNodeDiagnosticCollectorComponent(collector: AbstractDiagnosticCollect private fun ConeSimpleDiagnostic.getFactory(): FirDiagnosticFactory0 { @Suppress("UNCHECKED_CAST") return when (kind) { - Syntax -> FirErrors.SYNTAX_ERROR + Syntax -> FirErrors.SYNTAX ReturnNotAllowed -> FirErrors.RETURN_NOT_ALLOWED UnresolvedLabel -> FirErrors.UNRESOLVED_LABEL NoThis -> FirErrors.NO_THIS diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt index 9321184ff9a..3a32d8fd51e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt @@ -100,7 +100,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIAL import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_IS_NOT_AN_EXPRESSION import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SUPER_NOT_AVAILABLE -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX_ERROR +import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SYNTAX import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_ARGUMENTS_NOT_ALLOWED import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_MISMATCH import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETERS_IN_ENUM @@ -138,7 +138,7 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension { // # - The new diagnostic differs from the old FE's one val MAP = FirDiagnosticFactoryToRendererMap("FIR").also { map -> // Miscellaneous - map.put(SYNTAX_ERROR, "Syntax error") + map.put(SYNTAX, "Syntax error") map.put(OTHER_ERROR, "Unknown (other) error") // General syntax diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index eabe8e6d156..982c1e4608c 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.* object FirErrors { // Miscellaneous - val SYNTAX_ERROR by error0() + val SYNTAX by error0() val OTHER_ERROR by error0() // General syntax @@ -171,4 +171,4 @@ object FirErrors { val VARIABLE_INITIALIZER_IS_REDUNDANT by warning0() val VARIABLE_NEVER_READ by warning0() val USELESS_CALL_ON_NOT_NULL by warning0() -} \ No newline at end of file +} diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt index 2ee78d6bbf2..652871e080d 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt @@ -16,7 +16,7 @@ object DummyNameChecker : FirMemberDeclarationChecker() { override fun check(declaration: FirMemberDeclaration, context: CheckerContext, reporter: DiagnosticReporter) { if (declaration !is FirSimpleFunction) return if (declaration.name.asString() == "dummy") { - declaration.source?.let { reporter.report(FirErrors.SYNTAX_ERROR.on(it)) } + declaration.source?.let { reporter.report(FirErrors.SYNTAX.on(it)) } } } -} \ No newline at end of file +}