From a5ea55ab6561b932a57d18593f89c81ad1d0f9f0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 9 Aug 2016 13:39:00 -0700
Subject: [PATCH] Ignore null, undefined, void when checking for discriminant
 property

---
 src/compiler/checker.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1f2eaea833d..c88ab16acd7 100644
--- 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));
+            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 (<TransientSymbol>prop).isDiscriminantProperty;
                 }
             }
             return false;