azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Rename DUPLICATE_LABEL_IN_WHEN to DUPLICATE_BRANCH_CONDITION_IN_WHEN

Browse Source 
... and fix the message

#KT-35289 Fixed
This commit is contained in:
Kirill Rakhman
2023-12-21 16:21:01 +01:00
committed by Space Team
parent 28eb78fe16
commit 8aa32d9f45
12 changed files with 117 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
+2 -2
View File
@@ -4245,8 +4245,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.DUPLICATE_LABEL_IN_WHEN) { firDiagnostic ->
DuplicateLabelInWhenImpl(
add(FirErrors.DUPLICATE_BRANCH_CONDITION_IN_WHEN) { firDiagnostic ->
DuplicateBranchConditionInWhenImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
+2 -2
View File
@@ -2958,8 +2958,8 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = CommaInWhenConditionWithoutArgument::class
}
interface DuplicateLabelInWhen : KtFirDiagnostic<KtElement> {
override val diagnosticClass get() = DuplicateLabelInWhen::class
interface DuplicateBranchConditionInWhen : KtFirDiagnostic<KtElement> {
override val diagnosticClass get() = DuplicateBranchConditionInWhen::class
}
interface ConfusingBranchConditionError : KtFirDiagnostic<PsiElement> {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+2 -2
View File
@@ -3563,10 +3563,10 @@ internal class CommaInWhenConditionWithoutArgumentImpl(
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.CommaInWhenConditionWithoutArgument
internal class DuplicateLabelInWhenImpl(
internal class DuplicateBranchConditionInWhenImpl(
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<KtElement>(firDiagnostic, token), KtFirDiagnostic.DuplicateLabelInWhen
) : KtAbstractFirDiagnostic<KtElement>(firDiagnostic, token), KtFirDiagnostic.DuplicateBranchConditionInWhen
internal class ConfusingBranchConditionErrorImpl(
firDiagnostic: KtPsiDiagnostic,
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+1 -1
View File
@@ -1470,7 +1470,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
parameter<String>("illegalReason")
}
val COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT by error<PsiElement>(PositioningStrategy.COMMAS)
val DUPLICATE_LABEL_IN_WHEN by warning<KtElement>()
val DUPLICATE_BRANCH_CONDITION_IN_WHEN by warning<KtElement>()
val CONFUSING_BRANCH_CONDITION by deprecationError<PsiElement>(LanguageFeature.ProhibitConfusingSyntaxInWhenBranches)
}
compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+1 -1
View File
@@ -750,7 +750,7 @@ object FirErrors {
val ELSE_MISPLACED_IN_WHEN: KtDiagnosticFactory0 by error0<KtWhenEntry>(SourceElementPositioningStrategies.ELSE_ENTRY)
val ILLEGAL_DECLARATION_IN_WHEN_SUBJECT: KtDiagnosticFactory1<String> by error1<KtElement, String>()
val COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT: KtDiagnosticFactory0 by error0<PsiElement>(SourceElementPositioningStrategies.COMMAS)
val DUPLICATE_LABEL_IN_WHEN: KtDiagnosticFactory0 by warning0<KtElement>()
val DUPLICATE_BRANCH_CONDITION_IN_WHEN: KtDiagnosticFactory0 by warning0<KtElement>()
val CONFUSING_BRANCH_CONDITION: KtDiagnosticFactoryForDeprecation0 by deprecationError0<PsiElement>(ProhibitConfusingSyntaxInWhenBranches)
// Context tracking
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirWhenConditionChecker.kt
+2 -2
View File
@@ -52,14 +52,14 @@ object FirWhenConditionChecker : FirWhenExpressionChecker() {
else -> continue
}
if (!checkedConstants.add(value)) {
reporter.reportOn(condition.source, FirErrors.DUPLICATE_LABEL_IN_WHEN, context)
reporter.reportOn(condition.source, FirErrors.DUPLICATE_BRANCH_CONDITION_IN_WHEN, context)
}
}
}
is FirTypeOperatorCall -> {
val coneType = condition.conversionTypeRef.coneType
if (!checkedTypes.add(coneType to condition.operation)) {
reporter.reportOn(condition.conversionTypeRef.source, FirErrors.DUPLICATE_LABEL_IN_WHEN, context)
reporter.reportOn(condition.conversionTypeRef.source, FirErrors.DUPLICATE_BRANCH_CONDITION_IN_WHEN, context)
}
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt
+2 -2
View File
@@ -207,7 +207,7 @@ 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.DIVISION_BY_ZERO
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DSL_SCOPE_VIOLATION
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DUPLICATE_LABEL_IN_WHEN
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DUPLICATE_BRANCH_CONDITION_IN_WHEN
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DUPLICATE_PARAMETER_NAME_IN_FUNCTION_TYPE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DYNAMIC_NOT_ALLOWED
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.DYNAMIC_RECEIVER_EXPECTED_BUT_WAS_NON_DYNAMIC
@@ -2241,7 +2241,7 @@ object FirErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT,
"Use '||' instead of commas in conditions of 'when' without a subject."
)
map.put(DUPLICATE_LABEL_IN_WHEN, "Duplicate label in 'when'.")
map.put(DUPLICATE_BRANCH_CONDITION_IN_WHEN, "Duplicate branch condition in 'when'.")
map.put(
ILLEGAL_DECLARATION_IN_WHEN_SUBJECT,
"Illegal variable declaration in ''when'' subject: {0}. Should be a simple ''val'' with an initializer.",
compiler/testData/diagnostics/tests/when/DuplicatedLabels.fir.kt
Vendored
+9 -9
View File
@@ -15,10 +15,10 @@ const val four = 4
fun first(arg: Int) = when (arg) {
1 -> 2
2 -> 3
<!DUPLICATE_LABEL_IN_WHEN!>1<!> -> 4
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>1<!> -> 4
4 -> 5
<!DUPLICATE_LABEL_IN_WHEN!>1<!> -> 6
<!DUPLICATE_LABEL_IN_WHEN!>2<!> -> 7
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>1<!> -> 6
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>2<!> -> 7
// Error should be here: see KT-11971
four -> 8
else -> 0
@@ -28,8 +28,8 @@ fun second(arg: String): Int {
when (arg) {
"ABC" -> return 0
"DEF" -> return 1
<!DUPLICATE_LABEL_IN_WHEN!>"ABC"<!> -> return -1
<!DUPLICATE_LABEL_IN_WHEN!>"DEF"<!> -> return -2
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>"ABC"<!> -> return -1
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>"DEF"<!> -> return -2
}
return 42
}
@@ -39,8 +39,8 @@ fun third(arg: Any?): Int {
null -> return -1
is String -> return 0
is Double -> return 1
is <!DUPLICATE_LABEL_IN_WHEN!>Double<!> -> return 2
<!DUPLICATE_LABEL_IN_WHEN, SENSELESS_NULL_IN_WHEN!>null<!> -> return 3
is <!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>Double<!> -> return 2
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN, SENSELESS_NULL_IN_WHEN!>null<!> -> return 3
!is String -> return 4
else -> return 5
}
@@ -51,7 +51,7 @@ enum class Color { RED, GREEN, BLUE }
fun fourth(arg: Color) = when (arg) {
Color.RED -> "RED"
Color.GREEN -> "GREEN"
<!DUPLICATE_LABEL_IN_WHEN!>Color.RED<!> -> "BLUE"
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>Color.RED<!> -> "BLUE"
Color.BLUE -> "BLUE"
}
@@ -65,6 +65,6 @@ object Foo
fun sixth(arg: Any?) = when (arg) {
Foo -> ""
<!DUPLICATE_LABEL_IN_WHEN!>Foo<!> -> ""
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>Foo<!> -> ""
else -> null
}
compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.fir.kt
Vendored
+2 -2
View File
@@ -15,9 +15,9 @@ fun test(d: Any, dl: Collection<dynamic>) {
when (d) {
<!USELESS_IS_CHECK!>is <!DYNAMIC_NOT_ALLOWED!>dynamic<!><!> -> {}
<!USELESS_IS_CHECK!>is <!DUPLICATE_LABEL_IN_WHEN, DYNAMIC_NOT_ALLOWED!>dynamic?<!><!> -> {}
<!USELESS_IS_CHECK!>is <!DUPLICATE_BRANCH_CONDITION_IN_WHEN, DYNAMIC_NOT_ALLOWED!>dynamic?<!><!> -> {}
<!USELESS_IS_CHECK!>!is <!DYNAMIC_NOT_ALLOWED!>dynamic<!><!> -> {}
<!USELESS_IS_CHECK!>!is <!DUPLICATE_LABEL_IN_WHEN, DYNAMIC_NOT_ALLOWED!>dynamic?<!><!> -> {}
<!USELESS_IS_CHECK!>!is <!DUPLICATE_BRANCH_CONDITION_IN_WHEN, DYNAMIC_NOT_ALLOWED!>dynamic?<!><!> -> {}
}
dl as List<dynamic>
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-4/neg/1.1.fir.kt
Vendored
+90
View File
@@ -0,0 +1,90 @@
// !LANGUAGE: +ProhibitSimplificationOfNonTrivialConstBooleanExpressions
// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
// SKIP_TXT
// FULL_JDK
/*
* KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
*
* SPEC VERSION: 0.1-313
* MAIN LINK: expressions, when-expression -> paragraph 4 -> sentence 1
* NUMBER: 1
* DESCRIPTION: it is possible to replace the else condition with an always-true condition
*/
// FILE: JavaEnum.java
enum JavaEnum {
Val_1,
Val_2,
}
// FILE: KotlinClass.kt
// TESTCASE NUMBER: 1
fun case1() {
val z = JavaEnum.Val_1
val when2 = <!NO_ELSE_IN_WHEN!>when<!> (z) {
JavaEnum.Val_1 -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>JavaEnum.Val_1<!> -> { }
}
}
// TESTCASE NUMBER: 2
fun case2() {
val b = false
val when2: Any = <!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>false<!> -> { }
}
}
// TESTCASE NUMBER: 3
fun case3() {
val a = false
val when2: Any = <!NO_ELSE_IN_WHEN!>when<!> (a) {
true -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>true<!> -> { }
}
}
// TESTCASE NUMBER: 4
fun case4() {
val x: SClass = SClass.B()
val when2 = <!NO_ELSE_IN_WHEN!>when<!> (x){
is SClass.A ->{ }
is SClass.B ->{ }
is <!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>SClass.B<!> ->{ }
}
}
sealed class SClass {
class A : SClass()
class B : SClass()
class C : SClass()
}
// TESTCASE NUMBER: 5
fun case5() {
val b = false
val when1: Any = when (b) {
false -> { }
!false -> { }
else -> { }
}
val when2: Any = <!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> { }
!false -> { }
}
val when3: Any = <!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>false<!> -> { }
!false -> { }
}
}
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-4/neg/1.1.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitSimplificationOfNonTrivialConstBooleanExpressions
// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
// SKIP_TXT
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-4/pos/1.1.fir.kt
Vendored
+4 -4
View File
@@ -37,7 +37,7 @@ fun case1() {
val when3 = when (z) {
JavaEnum.Val_1 -> { }
JavaEnum.Val_2 -> { }
<!DUPLICATE_LABEL_IN_WHEN!>JavaEnum.Val_2<!> -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>JavaEnum.Val_2<!> -> { }
}
}
@@ -57,7 +57,7 @@ fun case2() {
}
val when3: Any = <!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> { }
<!DUPLICATE_LABEL_IN_WHEN!>false<!> -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>false<!> -> { }
!false -> { }
}
}
@@ -78,7 +78,7 @@ fun case3() {
val when3: Any = when (a) {
true -> { }
false -> { }
<!DUPLICATE_LABEL_IN_WHEN!>false<!> -> { }
<!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>false<!> -> { }
}
}
@@ -102,7 +102,7 @@ fun case4() {
val when3 = when (x){
is SClass.A ->{ }
is SClass.B ->{ }
is <!DUPLICATE_LABEL_IN_WHEN!>SClass.B<!> ->{ }
is <!DUPLICATE_BRANCH_CONDITION_IN_WHEN!>SClass.B<!> ->{ }
is SClass.C ->{ }
}
}