From 0a7364feea502ddbba54d1071cb7ee8cd6aab05a Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Mon, 12 Dec 2016 18:11:56 -0800
Subject: [PATCH] fix(language-service): correctly type undefined

fixes #13412
closes #13414
---
 .../@angular/language-service/src/expressions.ts    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/@angular/language-service/src/expressions.ts b/modules/@angular/language-service/src/expressions.ts
index 7f609512fe..cf2afdaff2 100644
--- a/modules/@angular/language-service/src/expressions.ts
+++ b/modules/@angular/language-service/src/expressions.ts
@@ -201,22 +201,25 @@ class AstType implements ExpressionVisitor {
 
   visitBinary(ast: Binary): Symbol {
     // Treat undefined and null as other.
-    function normalize(kind: BuiltinType): BuiltinType {
+    function normalize(kind: BuiltinType, other: BuiltinType): BuiltinType {
       switch (kind) {
         case BuiltinType.Undefined:
         case BuiltinType.Null:
-          return BuiltinType.Other;
+          return normalize(other, BuiltinType.Other);
       }
       return kind;
     }
 
     const leftType = this.getType(ast.left);
     const rightType = this.getType(ast.right);
-    const leftKind = normalize(this.query.getTypeKind(leftType));
-    const rightKind = normalize(this.query.getTypeKind(rightType));
+    const leftRawKind = this.query.getTypeKind(leftType);
+    const rightRawKind = this.query.getTypeKind(rightType);
+    const leftKind = normalize(leftRawKind, rightRawKind);
+    const rightKind = normalize(rightRawKind, leftRawKind);
 
     // The following swtich implements operator typing similar to the
     // type production tables in the TypeScript specification.
+    // https://github.com/Microsoft/TypeScript/blob/v1.8.10/doc/spec.md#4.19
     const operKind = leftKind << 8 | rightKind;
     switch (ast.operation) {
       case '*':
@@ -403,6 +406,8 @@ class AstType implements ExpressionVisitor {
         return this.query.getBuiltinType(BuiltinType.Boolean);
       case null:
         return this.query.getBuiltinType(BuiltinType.Null);
+      case undefined:
+        return this.query.getBuiltinType(BuiltinType.Undefined);
       default:
         switch (typeof ast.value) {
           case 'string':