From 201305859f9a9a9fc7e93de59238e647c49ced51 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 22 Aug 2016 11:21:06 -0700
Subject: [PATCH] Fix class/interface merging issue + lint error

---
 src/compiler/checker.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3abf271a57..418f5e40a8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -3564,11 +3564,13 @@ namespace ts {
                 if (type.flags & TypeFlags.Tuple) {
                     type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters))];
                 }
-                else if (type.symbol.flags & SymbolFlags.Class) {
-                    resolveBaseTypesOfClass(type);
-                }
-                else if (type.symbol.flags & SymbolFlags.Interface) {
-                    resolveBaseTypesOfInterface(type);
+                else if (type.symbol.flags & (SymbolFlags.Class | SymbolFlags.Interface)) {
+                    if (type.symbol.flags & SymbolFlags.Class) {
+                        resolveBaseTypesOfClass(type);
+                    }
+                    if (type.symbol.flags & SymbolFlags.Interface) {
+                        resolveBaseTypesOfInterface(type);
+                    }
                 }
                 else {
                     Debug.fail("type must be class or interface");
@@ -4972,7 +4974,7 @@ namespace ts {
         }
 
         function cloneTypeReference(source: TypeReference): TypeReference {
-            let type = <TypeReference>createObjectType(source.flags, source.symbol);
+            const type = <TypeReference>createObjectType(source.flags, source.symbol);
             type.target = source.target;
             type.typeArguments = source.typeArguments;
             return type;