From b1fb0ba9e1324d06a7ad55fcf7d2598e5e285501 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 19 Apr 2021 15:23:50 +0300 Subject: [PATCH] Fix FirDiagnosticsList (remove earlier dropped FirSourceElements) --- .../diagnostics/FirDiagnosticsList.kt | 30 +++++++++---------- .../fir/analysis/diagnostics/FirErrors.kt | 30 +++++++++---------- .../checkers/expression/FirForLoopChecker.kt | 8 ++--- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt index f6a67da4a09..c6cb03ef6c3 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt @@ -50,7 +50,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() { val ILLEGAL_CONST_EXPRESSION by error() val ILLEGAL_UNDERSCORE by error() val EXPRESSION_EXPECTED by error(PositioningStrategy.SELECTOR_BY_QUALIFIED) - val ASSIGNMENT_IN_EXPRESSION_CONTEXT by error() + val ASSIGNMENT_IN_EXPRESSION_CONTEXT by error() val BREAK_OR_CONTINUE_OUTSIDE_A_LOOP by error() val NOT_A_LOOP_LABEL by error() val VARIABLE_EXPECTED by error() @@ -185,7 +185,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() { parameter("modifier") parameter("target") } - val OPERATOR_MODIFIER_REQUIRED by error { + val OPERATOR_MODIFIER_REQUIRED by error { parameter("functionSymbol") parameter("name") } @@ -260,13 +260,13 @@ object DIAGNOSTICS_LIST : DiagnosticList() { val ASSIGN_OPERATOR_AMBIGUITY by error { parameter>>("candidates") } - val ITERATOR_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { + val ITERATOR_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { parameter>>("candidates") } - val HAS_NEXT_FUNCTION_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { + val HAS_NEXT_FUNCTION_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { parameter>>("candidates") } - val NEXT_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { + val NEXT_AMBIGUITY by error(PositioningStrategy.REFERENCE_BY_QUALIFIED) { parameter>>("candidates") } } @@ -484,7 +484,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() { } val FUNCTION_DECLARATION_WITH_NO_NAME by error(PositioningStrategy.DECLARATION_SIGNATURE) - val ANONYMOUS_FUNCTION_WITH_NAME by error() + val ANONYMOUS_FUNCTION_WITH_NAME by error() // TODO: val ANONYMOUS_FUNCTION_WITH_NAME by error1(SourceElementPositioningStrategies.DECLARATION_NAME) val ANONYMOUS_FUNCTION_PARAMETER_WITH_DEFAULT_VALUE by error(PositioningStrategy.PARAMETER_DEFAULT_VALUE) @@ -625,7 +625,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() { parameter("operator") parameter("rhs") } - val ITERATOR_ON_NULLABLE by error() + val ITERATOR_ON_NULLABLE by error() val UNNECESSARY_SAFE_CALL by warning(PositioningStrategy.SAFE_ACCESS) { parameter("receiverType") } @@ -662,25 +662,25 @@ object DIAGNOSTICS_LIST : DiagnosticList() { val CONVENTIONS by object : DiagnosticGroup("Conventions") { val NO_GET_METHOD by error(PositioningStrategy.ARRAY_ACCESS) val NO_SET_METHOD by error(PositioningStrategy.ARRAY_ACCESS) - val ITERATOR_MISSING by error() - val HAS_NEXT_MISSING by error() - val NEXT_MISSING by error() - val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error { + val ITERATOR_MISSING by error() + val HAS_NEXT_MISSING by error() + val NEXT_MISSING by error() + val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error { parameter>>("candidates") } - val NEXT_NONE_APPLICABLE by error { + val NEXT_NONE_APPLICABLE by error { parameter>>("candidates") } - val DELEGATE_SPECIAL_FUNCTION_MISSING by error { + val DELEGATE_SPECIAL_FUNCTION_MISSING by error { parameter("expectedFunctionSignature") parameter("delegateType") parameter("description") } - val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error { + val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error { parameter("expectedFunctionSignature") parameter>>("candidates") } - val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error { + val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error { parameter("expectedFunctionSignature") parameter>>("candidates") } diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt index d7bef602682..6992844e0a8 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt @@ -78,7 +78,7 @@ object FirErrors { val ILLEGAL_CONST_EXPRESSION by error0() val ILLEGAL_UNDERSCORE by error0() val EXPRESSION_EXPECTED by error0(SourceElementPositioningStrategies.SELECTOR_BY_QUALIFIED) - val ASSIGNMENT_IN_EXPRESSION_CONTEXT by error0() + val ASSIGNMENT_IN_EXPRESSION_CONTEXT by error0() val BREAK_OR_CONTINUE_OUTSIDE_A_LOOP by error0() val NOT_A_LOOP_LABEL by error0() val VARIABLE_EXPECTED by error0() @@ -174,7 +174,7 @@ object FirErrors { val INCOMPATIBLE_MODIFIERS by error2() val REDUNDANT_OPEN_IN_INTERFACE by warning0(SourceElementPositioningStrategies.OPEN_MODIFIER) val WRONG_MODIFIER_TARGET by error2() - val OPERATOR_MODIFIER_REQUIRED by error2() + val OPERATOR_MODIFIER_REQUIRED by error2() // Inline classes val INLINE_CLASS_NOT_TOP_LEVEL by error0(SourceElementPositioningStrategies.INLINE_OR_VALUE_MODIFIER) @@ -210,9 +210,9 @@ object FirErrors { // Ambiguity val OVERLOAD_RESOLUTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) val ASSIGN_OPERATOR_AMBIGUITY by error1>>() - val ITERATOR_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val HAS_NEXT_FUNCTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val NEXT_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val ITERATOR_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val HAS_NEXT_FUNCTION_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) + val NEXT_AMBIGUITY by error1>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) // Types & type parameters val TYPE_MISMATCH by error2() @@ -297,7 +297,7 @@ object FirErrors { val PRIVATE_FUNCTION_WITH_NO_BODY by error1(SourceElementPositioningStrategies.VISIBILITY_MODIFIER) val NON_MEMBER_FUNCTION_NO_BODY by error1(SourceElementPositioningStrategies.DECLARATION_SIGNATURE) val FUNCTION_DECLARATION_WITH_NO_NAME by error0(SourceElementPositioningStrategies.DECLARATION_SIGNATURE) - val ANONYMOUS_FUNCTION_WITH_NAME by error0() + val ANONYMOUS_FUNCTION_WITH_NAME by error0() val ANONYMOUS_FUNCTION_PARAMETER_WITH_DEFAULT_VALUE by error0(SourceElementPositioningStrategies.PARAMETER_DEFAULT_VALUE) val USELESS_VARARG_ON_PARAMETER by warning0() val MULTIPLE_VARARG_PARAMETERS by error0(SourceElementPositioningStrategies.PARAMETER_VARARG_MODIFIER) @@ -367,7 +367,7 @@ object FirErrors { val UNSAFE_IMPLICIT_INVOKE_CALL by error1(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) val UNSAFE_INFIX_CALL by error3(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) val UNSAFE_OPERATOR_CALL by error3(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED) - val ITERATOR_ON_NULLABLE by error0() + val ITERATOR_ON_NULLABLE by error0() val UNNECESSARY_SAFE_CALL by warning1(SourceElementPositioningStrategies.SAFE_ACCESS) val UNEXPECTED_SAFE_CALL by error0(SourceElementPositioningStrategies.SAFE_ACCESS) val UNNECESSARY_NOT_NULL_ASSERTION by warning1(SourceElementPositioningStrategies.OPERATOR) @@ -388,14 +388,14 @@ object FirErrors { // Conventions val NO_GET_METHOD by error0(SourceElementPositioningStrategies.ARRAY_ACCESS) val NO_SET_METHOD by error0(SourceElementPositioningStrategies.ARRAY_ACCESS) - val ITERATOR_MISSING by error0() - val HAS_NEXT_MISSING by error0() - val NEXT_MISSING by error0() - val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error1>>() - val NEXT_NONE_APPLICABLE by error1>>() - val DELEGATE_SPECIAL_FUNCTION_MISSING by error3() - val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error2>>() - val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error2>>() + val ITERATOR_MISSING by error0() + val HAS_NEXT_MISSING by error0() + val NEXT_MISSING by error0() + val HAS_NEXT_FUNCTION_NONE_APPLICABLE by error1>>() + val NEXT_NONE_APPLICABLE by error1>>() + val DELEGATE_SPECIAL_FUNCTION_MISSING by error3() + val DELEGATE_SPECIAL_FUNCTION_AMBIGUITY by error2>>() + val DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE by error2>>() // Type alias val TOPLEVEL_TYPEALIASES_ONLY by error0() diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt index 96592b11645..b6beed3f626 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt @@ -86,10 +86,10 @@ object FirForLoopChecker : FirBlockChecker() { reporter: DiagnosticReporter, reportSource: FirSourceElement?, context: CheckerContext, - ambiguityFactory: FirDiagnosticFactory1>>, - missingFactory: FirDiagnosticFactory0, - noneApplicableFactory: FirDiagnosticFactory1>>? = null, - unsafeCallFactory: FirDiagnosticFactory0? = null, + ambiguityFactory: FirDiagnosticFactory1>>, + missingFactory: FirDiagnosticFactory0, + noneApplicableFactory: FirDiagnosticFactory1>>? = null, + unsafeCallFactory: FirDiagnosticFactory0? = null, ): Boolean { when (val calleeReference = call.calleeReference) { is FirErrorNamedReference -> {