From cc4b50fdc11030b86a80650fe91a7dd27b5f9aff Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Thu, 2 Jul 2020 16:31:25 +0300 Subject: [PATCH] [FIR] Add illegal underscore diagnostic --- .../components/ErrorNodeDiagnosticCollectorComponent.kt | 1 + .../kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt | 2 ++ .../org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt | 1 + .../jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt | 1 + 4 files changed, 5 insertions(+) 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 adf19dee341..94faaaf2074 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 @@ -70,6 +70,7 @@ class ErrorNodeDiagnosticCollectorComponent(collector: AbstractDiagnosticCollect ReturnNotAllowed -> FirErrors.RETURN_NOT_ALLOWED UnresolvedLabel -> FirErrors.UNRESOLVED_LABEL IllegalConstExpression -> FirErrors.ILLEGAL_CONST_EXPRESSION + IllegalUnderscore -> FirErrors.ILLEGAL_UNDERSCORE DeserializationError -> FirErrors.DESERIALIZATION_ERROR InferenceError -> FirErrors.INFERENCE_ERROR TypeParameterAsSupertype -> FirErrors.TYPE_PARAMETER_AS_SUPERTYPE 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 abc77892bb0..963695bef2e 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 @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_PROPERTY_ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_RECEIVER_TYPE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_TYPEALIAS_EXPANDED_TYPE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ILLEGAL_CONST_EXPRESSION +import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ILLEGAL_UNDERSCORE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INAPPLICABLE_CANDIDATE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INCOMPATIBLE_MODIFIERS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INFERENCE_ERROR @@ -53,6 +54,7 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension { map.put(SYNTAX_ERROR, "Syntax error") map.put(UNRESOLVED_LABEL, "Unresolved label") map.put(ILLEGAL_CONST_EXPRESSION, "Illegal const expression") + map.put(ILLEGAL_UNDERSCORE, "Illegal underscore") map.put(DESERIALIZATION_ERROR, "Deserialization error") map.put(INFERENCE_ERROR, "Inference error") map.put(TYPE_PARAMETER_AS_SUPERTYPE, "Type parameter as supertype") 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 3de89d635cf..2125a617411 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 @@ -27,6 +27,7 @@ object FirErrors { val SYNTAX_ERROR by error0() val UNRESOLVED_LABEL by error0() val ILLEGAL_CONST_EXPRESSION by error0() + val ILLEGAL_UNDERSCORE by error0() val DESERIALIZATION_ERROR by error0() val INFERENCE_ERROR by error0() val TYPE_PARAMETER_AS_SUPERTYPE by error0() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt index 73e3a3a38e5..ae93887ddf2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt @@ -17,6 +17,7 @@ enum class DiagnosticKind { ReturnNotAllowed, UnresolvedLabel, IllegalConstExpression, + IllegalUnderscore, DeserializationError, InferenceError, TypeParameterAsSupertype,