Update LKG

mhegazy · mhegazy · commit 4ce4f58243fc · 2018-05-25T14:40:51.000-07:00
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -23652,7 +23652,7 @@ var ts;
             }
         }
         function typeToString(type, enclosingDeclaration, flags, writer) {
-            if (flags === void 0) { flags = 1048576; }
+            if (flags === void 0) { flags = 1048576 | 16384; }
             if (writer === void 0) { writer = ts.createTextWriter(""); }
             var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960, writer);
             ts.Debug.assert(typeNode !== undefined, "should always get typenode");
@@ -24477,6 +24477,7 @@ var ts;
             }
         }
         function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384; }
             return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
             function typePredicateToStringWorker(writer) {
                 var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 | 512));
diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -25095,7 +25095,7 @@ var ts;
             }
         }
         function typeToString(type, enclosingDeclaration, flags, writer) {
-            if (flags === void 0) { flags = 1048576; }
+            if (flags === void 0) { flags = 1048576 | 16384; }
             if (writer === void 0) { writer = ts.createTextWriter(""); }
             var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960, writer);
             ts.Debug.assert(typeNode !== undefined, "should always get typenode");
@@ -25920,6 +25920,7 @@ var ts;
             }
         }
         function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384; }
             return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
             function typePredicateToStringWorker(writer) {
                 var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 | 512));
@@ -71488,7 +71489,7 @@ var ts;
     ts.mapToDisplayParts = mapToDisplayParts;
     function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
         return mapToDisplayParts(function (writer) {
-            typechecker.writeType(type, enclosingDeclaration, flags | 1024, writer);
+            typechecker.writeType(type, enclosingDeclaration, flags | 1024 | 16384, writer);
         });
     }
     ts.typeToDisplayParts = typeToDisplayParts;
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -29202,7 +29202,7 @@ var ts;
             }
         }
         function typeToString(type, enclosingDeclaration, flags, writer) {
-            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */; }
+            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */ | 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             if (writer === void 0) { writer = ts.createTextWriter(""); }
             var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */, writer);
             ts.Debug.assert(typeNode !== undefined, "should always get typenode");
@@ -30069,6 +30069,7 @@ var ts;
             }
         }
         function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
             function typePredicateToStringWorker(writer) {
                 var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 /* Identifier */ ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */));
@@ -85982,7 +85983,7 @@ var ts;
     ts.mapToDisplayParts = mapToDisplayParts;
     function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
         return mapToDisplayParts(function (writer) {
-            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, writer);
+            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */ | 16384 /* UseAliasDefinedOutsideCurrentScope */, writer);
         });
     }
     ts.typeToDisplayParts = typeToDisplayParts;
diff --git a/lib/typescript.js b/lib/typescript.js
@@ -29202,7 +29202,7 @@ var ts;
             }
         }
         function typeToString(type, enclosingDeclaration, flags, writer) {
-            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */; }
+            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */ | 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             if (writer === void 0) { writer = ts.createTextWriter(""); }
             var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */, writer);
             ts.Debug.assert(typeNode !== undefined, "should always get typenode");
@@ -30069,6 +30069,7 @@ var ts;
             }
         }
         function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
             function typePredicateToStringWorker(writer) {
                 var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 /* Identifier */ ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */));
@@ -85982,7 +85983,7 @@ var ts;
     ts.mapToDisplayParts = mapToDisplayParts;
     function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
         return mapToDisplayParts(function (writer) {
-            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, writer);
+            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */ | 16384 /* UseAliasDefinedOutsideCurrentScope */, writer);
         });
     }
     ts.typeToDisplayParts = typeToDisplayParts;
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -29202,7 +29202,7 @@ var ts;
             }
         }
         function typeToString(type, enclosingDeclaration, flags, writer) {
-            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */; }
+            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */ | 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             if (writer === void 0) { writer = ts.createTextWriter(""); }
             var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */, writer);
             ts.Debug.assert(typeNode !== undefined, "should always get typenode");
@@ -30069,6 +30069,7 @@ var ts;
             }
         }
         function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; }
             return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
             function typePredicateToStringWorker(writer) {
                 var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 /* Identifier */ ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 3112960 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */));
@@ -85982,7 +85983,7 @@ var ts;
     ts.mapToDisplayParts = mapToDisplayParts;
     function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
         return mapToDisplayParts(function (writer) {
-            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, writer);
+            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */ | 16384 /* UseAliasDefinedOutsideCurrentScope */, writer);
         });
     }
     ts.typeToDisplayParts = typeToDisplayParts;
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -21040,12 +21040,11 @@ var ts;
             }());
             function getDefaultNPMLocation(processName) {
                 if (path.basename(processName).indexOf("node") === 0) {
-                    var npmPath = "\"" + path.join(path.dirname(process.argv[0]), "npm") + "\"";
-                    if (fs.existsSync(npmPath)) {
-                        return npmPath;
-                    }
+                    return "\"" + path.join(path.dirname(process.argv[0]), "npm") + "\"";
+                }
+                else {
+                    return "npm";
                 }
-                return "npm";
             }
             function loadTypesRegistryFile(typesRegistryFilePath, host, log) {
                 if (!host.fileExists(typesRegistryFilePath)) {

Original file line number	Diff line number	Diff line change
`@@ -23652,7 +23652,7 @@ var ts;`
`23652`	`23652`	`}`
`23653`	`23653`	`}`
`23654`	`23654`	`function typeToString(type, enclosingDeclaration, flags, writer) {`
`23655`		`- if (flags === void 0) { flags = 1048576; }`
	`23655`	`+ if (flags === void 0) { flags = 1048576 \| 16384; }`
`23656`	`23656`	`if (writer === void 0) { writer = ts.createTextWriter(""); }`
`23657`	`23657`	`var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960, writer);`
`23658`	`23658`	`ts.Debug.assert(typeNode !== undefined, "should always get typenode");`
`@@ -24477,6 +24477,7 @@ var ts;`
`24477`	`24477`	`}`
`24478`	`24478`	`}`
`24479`	`24479`	`function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {`
	`24480`	`+ if (flags === void 0) { flags = 16384; }`
`24480`	`24481`	`return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);`
`24481`	`24482`	`function typePredicateToStringWorker(writer) {`
`24482`	`24483`	`var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960 \| 512));`
Original file line number	Diff line number	Diff line change
`@@ -25095,7 +25095,7 @@ var ts;`
`25095`	`25095`	`}`
`25096`	`25096`	`}`
`25097`	`25097`	`function typeToString(type, enclosingDeclaration, flags, writer) {`
`25098`		`- if (flags === void 0) { flags = 1048576; }`
	`25098`	`+ if (flags === void 0) { flags = 1048576 \| 16384; }`
`25099`	`25099`	`if (writer === void 0) { writer = ts.createTextWriter(""); }`
`25100`	`25100`	`var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960, writer);`
`25101`	`25101`	`ts.Debug.assert(typeNode !== undefined, "should always get typenode");`
`@@ -25920,6 +25920,7 @@ var ts;`
`25920`	`25920`	`}`
`25921`	`25921`	`}`
`25922`	`25922`	`function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {`
	`25923`	`+ if (flags === void 0) { flags = 16384; }`
`25923`	`25924`	`return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);`
`25924`	`25925`	`function typePredicateToStringWorker(writer) {`
`25925`	`25926`	`var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960 \| 512));`
`@@ -71488,7 +71489,7 @@ var ts;`
`71488`	`71489`	`ts.mapToDisplayParts = mapToDisplayParts;`
`71489`	`71490`	`function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {`
`71490`	`71491`	`return mapToDisplayParts(function (writer) {`
`71491`		`- typechecker.writeType(type, enclosingDeclaration, flags \| 1024, writer);`
	`71492`	`+ typechecker.writeType(type, enclosingDeclaration, flags \| 1024 \| 16384, writer);`
`71492`	`71493`	`});`
`71493`	`71494`	`}`
`71494`	`71495`	`ts.typeToDisplayParts = typeToDisplayParts;`
Original file line number	Diff line number	Diff line change
`@@ -29202,7 +29202,7 @@ var ts;`
`29202`	`29202`	`}`
`29203`	`29203`	`}`
`29204`	`29204`	`function typeToString(type, enclosingDeclaration, flags, writer) {`
`29205`		`- if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */; }`
	`29205`	`+ if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType / \| 16384 / UseAliasDefinedOutsideCurrentScope */; }`
`29206`	`29206`	`if (writer === void 0) { writer = ts.createTextWriter(""); }`
`29207`	`29207`	`var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960 /* IgnoreErrors */, writer);`
`29208`	`29208`	`ts.Debug.assert(typeNode !== undefined, "should always get typenode");`
`@@ -30069,6 +30069,7 @@ var ts;`
`30069`	`30069`	`}`
`30070`	`30070`	`}`
`30071`	`30071`	`function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {`
	`30072`	`+ if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; }`
`30072`	`30073`	`return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);`
`30073`	`30074`	`function typePredicateToStringWorker(writer) {`
`30074`	`30075`	`var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 /* Identifier / ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) \| 3112960 / IgnoreErrors / \| 512 / WriteTypeParametersInQualifiedName */));`
`@@ -85982,7 +85983,7 @@ var ts;`
`85982`	`85983`	`ts.mapToDisplayParts = mapToDisplayParts;`
`85983`	`85984`	`function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {`
`85984`	`85985`	`return mapToDisplayParts(function (writer) {`
`85985`		`- typechecker.writeType(type, enclosingDeclaration, flags \| 1024 /* MultilineObjectLiterals */, writer);`
	`85986`	`+ typechecker.writeType(type, enclosingDeclaration, flags \| 1024 /* MultilineObjectLiterals / \| 16384 / UseAliasDefinedOutsideCurrentScope */, writer);`
`85986`	`85987`	`});`
`85987`	`85988`	`}`
`85988`	`85989`	`ts.typeToDisplayParts = typeToDisplayParts;`