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

[FE 1.0] Fix reporting of non exhaustive when statement for whens with subject

Browse Source 
^KT-48653 Fixed
This commit is contained in:
Dmitriy Novozhilov
2021-09-09 15:19:18 +03:00
parent f6ae6af741
commit 7a7672b0de
9 changed files with 145 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -32111,6 +32111,18 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/when/kt47922.kt");
}
@Test
@TestMetadata("kt48653_after.kt")
public void testKt48653_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_after.kt");
}
@Test
@TestMetadata("kt48653_before.kt")
public void testKt48653_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_before.kt");
}
@Test
@TestMetadata("kt9929.kt")
public void testKt9929() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+12
View File
@@ -32111,6 +32111,18 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/when/kt47922.kt");
}
@Test
@TestMetadata("kt48653_after.kt")
public void testKt48653_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_after.kt");
}
@Test
@TestMetadata("kt48653_before.kt")
public void testKt48653_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_before.kt");
}
@Test
@TestMetadata("kt9929.kt")
public void testKt9929() throws Exception {
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+1 -4
View File
@@ -1002,7 +1002,7 @@ class ControlFlowInformationProviderImpl private constructor(
trace.report(EXPECT_TYPE_IN_WHEN_WITHOUT_ELSE.on(element, it.typeOfDeclaration))
}
} else if (subjectExpression != null) {
val subjectType = trace.getType(subjectExpression)
val subjectType = WhenChecker.whenSubjectType(element, trace.bindingContext)
if (elseEntry != null) {
if (missingCases.isEmpty() && subjectType != null && !subjectType.isFlexible()) {
val subjectClass = subjectType.constructor.declarationDescriptor as? ClassDescriptor
@@ -1016,9 +1016,6 @@ class ControlFlowInformationProviderImpl private constructor(
}
}
continue
}
if (!usedAsExpression) {
}
if (!usedAsExpression) {
if (languageVersionSettings.supportsFeature(LanguageFeature.WarnAboutNonExhaustiveWhenOnAlgebraicTypes)) {
compiler/testData/diagnostics/tests/when/kt48653_after.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// FIR_IDENTICAL
// LANGUAGE: +ProhibitNonExhaustiveWhenOnAlgebraicTypes
// ISSUE: KT-48653
sealed class Sealed {
object A : Sealed()
object B : Sealed()
}
fun functionReturningSealed(): Sealed = null!!
fun test_1() {
<!NO_ELSE_IN_WHEN!>when<!> (val result = functionReturningSealed()) {
is Sealed.A -> {}
}
}
fun test_2() {
val result2 = functionReturningSealed()
<!NO_ELSE_IN_WHEN!>when<!> (result2) {
is Sealed.A -> {}
}
}
compiler/testData/diagnostics/tests/when/kt48653_after.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
package
public fun functionReturningSealed(): Sealed
public fun test_1(): kotlin.Unit
public fun test_2(): kotlin.Unit
public sealed class Sealed {
protected constructor Sealed()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public object A : Sealed {
private constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object B : Sealed {
private constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/when/kt48653_before.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// FIR_IDENTICAL
// LANGUAGE: -ProhibitNonExhaustiveWhenOnAlgebraicTypes
// ISSUE: KT-48653
sealed class Sealed {
object A : Sealed()
object B : Sealed()
}
fun functionReturningSealed(): Sealed = null!!
fun test_1() {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (val result = functionReturningSealed()) {
is Sealed.A -> {}
}
}
fun test_2() {
val result2 = functionReturningSealed()
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (result2) {
is Sealed.A -> {}
}
}
compiler/testData/diagnostics/tests/when/kt48653_before.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
package
public fun functionReturningSealed(): Sealed
public fun test_1(): kotlin.Unit
public fun test_2(): kotlin.Unit
public sealed class Sealed {
protected constructor Sealed()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public object A : Sealed {
private constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object B : Sealed {
private constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+12
View File
@@ -32207,6 +32207,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/when/kt47922.kt");
}
@Test
@TestMetadata("kt48653_after.kt")
public void testKt48653_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_after.kt");
}
@Test
@TestMetadata("kt48653_before.kt")
public void testKt48653_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_before.kt");
}
@Test
@TestMetadata("kt9929.kt")
public void testKt9929() throws Exception {
idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+12
View File
@@ -32111,6 +32111,18 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/when/kt47922.kt");
}
@Test
@TestMetadata("kt48653_after.kt")
public void testKt48653_after() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_after.kt");
}
@Test
@TestMetadata("kt48653_before.kt")
public void testKt48653_before() throws Exception {
runTest("compiler/testData/diagnostics/tests/when/kt48653_before.kt");
}
@Test
@TestMetadata("kt9929.kt")
public void testKt9929() throws Exception {