Ignore null, undefined, void when checking for discriminant property

ahejlsberg · ahejlsberg · commit a5ea55ab6561 · 2016-08-09T13:39:00.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7837,14 +7837,17 @@ namespace ts {
         }
 
         function isDiscriminantProperty(type: Type, name: string) {
-            if (type && type.flags & TypeFlags.Union) {
-                const prop = getPropertyOfType(type, name);
-                if (prop && prop.flags & SymbolFlags.SyntheticProperty) {
-                    if ((<TransientSymbol>prop).isDiscriminantProperty === undefined) {
-                        (<TransientSymbol>prop).isDiscriminantProperty = !(<TransientSymbol>prop).hasCommonType &&
-                            isUnitUnionType(getTypeOfSymbol(prop));
-                    }
-                    return (<TransientSymbol>prop).isDiscriminantProperty;
+            if (type) {
+                const nonNullType = getNonNullableType(type);
+                if (nonNullType.flags & TypeFlags.Union) {
+                    const prop = getPropertyOfType(nonNullType, name);
+                    if (prop && prop.flags & SymbolFlags.SyntheticProperty) {
+                        if ((<TransientSymbol>prop).isDiscriminantProperty === undefined) {
+                            (<TransientSymbol>prop).isDiscriminantProperty = !(<TransientSymbol>prop).hasCommonType &&
+                                isUnitUnionType(getTypeOfSymbol(prop));
+                        }
+                        return (<TransientSymbol>prop).isDiscriminantProperty;
+                    }
                 }
             }
             return false;
