From 4ce228055926252c4f823245c49d9e3d9fc91164 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 14 Sep 2016 13:42:01 -0700
Subject: [PATCH] Update LKG

---
 lib/tsc.js                  | 17 +++++++++++------
 lib/tsserver.js             | 17 +++++++++++------
 lib/tsserverlibrary.d.ts    |  1 +
 lib/tsserverlibrary.js      | 17 +++++++++++------
 lib/typescript.d.ts         |  1 +
 lib/typescript.js           | 18 ++++++++++++------
 lib/typescriptServices.d.ts |  1 +
 lib/typescriptServices.js   | 18 ++++++++++++------
 8 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/lib/tsc.js b/lib/tsc.js
index 45fa034a5d88d..4c3cda93213c3 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -14792,8 +14792,13 @@ var ts;
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
                     else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
-                        var typeArguments = type.aliasTypeArguments;
-                        writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        if (type.flags & 2097152 || !(flags & 1024)) {
+                            var typeArguments = type.aliasTypeArguments;
+                            writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        }
+                        else {
+                            writeUnionOrIntersectionType(type, nextFlags);
+                        }
                     }
                     else if (type.flags & 1572864) {
                         writeUnionOrIntersectionType(type, nextFlags);
@@ -29039,7 +29044,7 @@ var ts;
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -29051,7 +29056,7 @@ var ts;
             }
             else {
                 errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
+                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -29244,7 +29249,7 @@ var ts;
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
                 write(";");
                 writeLine();
                 write(node.isExportEquals ? "export = " : "export default ");
@@ -29649,7 +29654,7 @@ var ts;
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
                 }
                 function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 3c0cd955fccc4..ec61c9c87a0d7 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -15788,8 +15788,13 @@ var ts;
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
                     else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
-                        var typeArguments = type.aliasTypeArguments;
-                        writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        if (type.flags & 2097152 || !(flags & 1024)) {
+                            var typeArguments = type.aliasTypeArguments;
+                            writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        }
+                        else {
+                            writeUnionOrIntersectionType(type, nextFlags);
+                        }
                     }
                     else if (type.flags & 1572864) {
                         writeUnionOrIntersectionType(type, nextFlags);
@@ -30035,7 +30040,7 @@ var ts;
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -30047,7 +30052,7 @@ var ts;
             }
             else {
                 errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
+                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -30240,7 +30245,7 @@ var ts;
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
                 write(";");
                 writeLine();
                 write(node.isExportEquals ? "export = " : "export default ");
@@ -30645,7 +30650,7 @@ var ts;
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
                 }
                 function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index c7ca800d0fe02..62f22632feb2a 100644
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -1319,6 +1319,7 @@ declare namespace ts {
         UseFullyQualifiedType = 128,
         InFirstTypeArgument = 256,
         InTypeAlias = 512,
+        UseTypeAliasValue = 1024,
     }
     const enum SymbolFormatFlags {
         None = 0,
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index bf90d17d542a2..ec39a42fecfce 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -15788,8 +15788,13 @@ var ts;
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
                     }
                     else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
-                        var typeArguments = type.aliasTypeArguments;
-                        writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        if (type.flags & 2097152 || !(flags & 1024)) {
+                            var typeArguments = type.aliasTypeArguments;
+                            writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        }
+                        else {
+                            writeUnionOrIntersectionType(type, nextFlags);
+                        }
                     }
                     else if (type.flags & 1572864) {
                         writeUnionOrIntersectionType(type, nextFlags);
@@ -30035,7 +30040,7 @@ var ts;
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -30047,7 +30052,7 @@ var ts;
             }
             else {
                 errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
+                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
                 errorNameNode = undefined;
             }
         }
@@ -30240,7 +30245,7 @@ var ts;
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
+                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
                 write(";");
                 writeLine();
                 write(node.isExportEquals ? "export = " : "export default ");
@@ -30645,7 +30650,7 @@ var ts;
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
                 }
                 function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 4855f1511adee..e8a6b54541e46 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -1328,6 +1328,7 @@ declare namespace ts {
         UseFullyQualifiedType = 128,
         InFirstTypeArgument = 256,
         InTypeAlias = 512,
+        UseTypeAliasValue = 1024,
     }
     enum SymbolFormatFlags {
         None = 0,
diff --git a/lib/typescript.js b/lib/typescript.js
index 4dd7530f3053b..a4d02a9413af2 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -480,6 +480,7 @@ var ts;
         TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
         TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
         TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
+        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
     })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
     var TypeFormatFlags = ts.TypeFormatFlags;
     (function (SymbolFormatFlags) {
@@ -18432,8 +18433,13 @@ var ts;
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
                     }
                     else if (!(flags & 512 /* InTypeAlias */) && type.flags & (2097152 /* Anonymous */ | 1572864 /* UnionOrIntersection */) && type.aliasSymbol) {
-                        var typeArguments = type.aliasTypeArguments;
-                        writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        if (type.flags & 2097152 /* Anonymous */ || !(flags & 1024 /* UseTypeAliasValue */)) {
+                            var typeArguments = type.aliasTypeArguments;
+                            writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        }
+                        else {
+                            writeUnionOrIntersectionType(type, nextFlags);
+                        }
                     }
                     else if (type.flags & 1572864 /* UnionOrIntersection */) {
                         writeUnionOrIntersectionType(type, nextFlags);
@@ -35233,7 +35239,7 @@ var ts;
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 errorNameNode = undefined;
             }
         }
@@ -35246,7 +35252,7 @@ var ts;
             }
             else {
                 errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 errorNameNode = undefined;
             }
         }
@@ -35448,7 +35454,7 @@ var ts;
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 write(";");
                 writeLine();
                 write(node.isExportEquals ? "export = " : "export default ");
@@ -35869,7 +35875,7 @@ var ts;
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 }
                 function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 50a2abcd8874b..d022520a285dc 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -1328,6 +1328,7 @@ declare namespace ts {
         UseFullyQualifiedType = 128,
         InFirstTypeArgument = 256,
         InTypeAlias = 512,
+        UseTypeAliasValue = 1024,
     }
     enum SymbolFormatFlags {
         None = 0,
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 4dd7530f3053b..a4d02a9413af2 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -480,6 +480,7 @@ var ts;
         TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
         TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
         TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 512] = "InTypeAlias";
+        TypeFormatFlags[TypeFormatFlags["UseTypeAliasValue"] = 1024] = "UseTypeAliasValue";
     })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
     var TypeFormatFlags = ts.TypeFormatFlags;
     (function (SymbolFormatFlags) {
@@ -18432,8 +18433,13 @@ var ts;
                         buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064 /* Type */, 0 /* None */, nextFlags);
                     }
                     else if (!(flags & 512 /* InTypeAlias */) && type.flags & (2097152 /* Anonymous */ | 1572864 /* UnionOrIntersection */) && type.aliasSymbol) {
-                        var typeArguments = type.aliasTypeArguments;
-                        writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        if (type.flags & 2097152 /* Anonymous */ || !(flags & 1024 /* UseTypeAliasValue */)) {
+                            var typeArguments = type.aliasTypeArguments;
+                            writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
+                        }
+                        else {
+                            writeUnionOrIntersectionType(type, nextFlags);
+                        }
                     }
                     else if (type.flags & 1572864 /* UnionOrIntersection */) {
                         writeUnionOrIntersectionType(type, nextFlags);
@@ -35233,7 +35239,7 @@ var ts;
             }
             else {
                 errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 errorNameNode = undefined;
             }
         }
@@ -35246,7 +35252,7 @@ var ts;
             }
             else {
                 errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 errorNameNode = undefined;
             }
         }
@@ -35448,7 +35454,7 @@ var ts;
                 write(tempVarName);
                 write(": ");
                 writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 write(";");
                 writeLine();
                 write(node.isExportEquals ? "export = " : "export default ");
@@ -35869,7 +35875,7 @@ var ts;
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
+                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */ | 1024 /* UseTypeAliasValue */, writer);
                 }
                 function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
                     var diagnosticMessage;