Make 'when' on nullable enums exhaustive if 'null' entry is present

#KT-2902 Fixed
2014-10-16 21:38:13 +04:00
parent 91105b8183
commit fe59dc27b3
9 changed files with 241 additions and 10 deletions
@@ -0,0 +1,37 @@
+// KT-2902 Check for null should be required when match nullable enum element
+
+// FILE: 1.kt
+
+enum class E { A B }
+
+fun test(e: E?) = <!NO_ELSE_IN_WHEN!>when<!> (e) {
+    E.A -> 1
+    E.B -> 2
+}
+
+fun withNull(e: E?) = when (e) {
+    E.A -> 3
+    E.B -> 4
+    null -> null
+}
+
+fun nullableNothing(): Nothing? = null
+fun withNullableNothing(e: E?) = when (e) {
+    E.A -> 5
+    E.B -> 6
+    nullableNothing() -> null
+}
+
+fun platformType() = <!NO_ELSE_IN_WHEN!>when<!> (J.foo()) {
+    E.A -> 7
+    E.B -> 8
+}
+
+
+// FILE: J.java
+
+class J {
+    static E foo() {
+        return E.A;
+    }
+}
@@ -0,0 +1,71 @@
+package 
+
+internal fun nullableNothing(): kotlin.Nothing?
+internal fun platformType(): kotlin.Int
+internal fun test(/*0*/ e: E?): kotlin.Int
+internal fun withNull(/*0*/ e: E?): kotlin.Int?
+internal fun withNullableNothing(/*0*/ e: E?): kotlin.Int?
+
+internal final enum class E : kotlin.Enum<E> {
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    
+    public enum entry A : E {
+        private constructor A()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-A> : E.A {
+            private constructor <class-object-for-A>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry B : E {
+        private constructor B()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-B> : E.B {
+            private constructor <class-object-for-B>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}
+
+public/*package*/ open class J {
+    public/*package*/ constructor J()
+    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
+
+    // Static members
+    public/*package*/ open fun foo(): E!
+}
@@ -0,0 +1,11 @@
+enum class E { A B }
+
+fun foo(e: E, something: Any?): Int {
+    if (something != null) return 0
+
+    return when (e) {
+        E.A -> 1
+        E.B -> 2
+        something -> 3
+    }
+}
@@ -0,0 +1,57 @@
+package
+
+internal fun foo(/*0*/ e: E, /*1*/ something: kotlin.Any?): kotlin.Int
+
+internal final enum class E : kotlin.Enum<E> {
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public enum entry A : E {
+        private constructor A()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-A> : E.A {
+            private constructor <class-object-for-A>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public enum entry B : E {
+        private constructor B()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-B> : E.B {
+            private constructor <class-object-for-B>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}