From 2ff333c71c2fa880e92b15ab20b3c75e4f0a9cb7 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Fri, 28 Jul 2017 09:21:45 -0700 Subject: [PATCH] Update LKG. --- lib/tsc.js | 8 ++++---- lib/tsserver.js | 32 +++++++++++++++++++++++++++----- lib/tsserverlibrary.d.ts | 2 +- lib/tsserverlibrary.js | 32 +++++++++++++++++++++++++++----- lib/typescript.d.ts | 2 +- lib/typescript.js | 8 ++++---- lib/typescriptServices.d.ts | 2 +- lib/typescriptServices.js | 8 ++++---- lib/typingsInstaller.js | 2 +- 9 files changed, 70 insertions(+), 26 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index a2ce0c5d0ca..ce4d95f686c 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -151,7 +151,7 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); (function (ts) { ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator(undefined, { usage: "sort", sensitivity: "accent" }) : undefined; @@ -23140,7 +23140,7 @@ var ts; } function getExportsOfModule(moduleSymbol) { var links = getSymbolLinks(moduleSymbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); + return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol)); } function extendExportSymbols(target, source, lookupTable, exportNode) { source && source.forEach(function (sourceSymbol, id) { @@ -23166,10 +23166,10 @@ var ts; } }); } - function getExportsForModule(moduleSymbol) { + function getExportsOfModuleWorker(moduleSymbol) { var visitedSymbols = []; moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); - return visit(moduleSymbol) || moduleSymbol.exports; + return visit(moduleSymbol) || emptySymbols; function visit(symbol) { if (!(symbol && symbol.flags & 1952 && !ts.contains(visitedSymbols, symbol))) { return; diff --git a/lib/tsserver.js b/lib/tsserver.js index 4d5b7fbb7f5..9f9ee092558 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -1145,7 +1145,7 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); (function (ts) { var Ternary; @@ -24334,7 +24334,7 @@ var ts; } function getExportsOfModule(moduleSymbol) { var links = getSymbolLinks(moduleSymbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); + return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol)); } function extendExportSymbols(target, source, lookupTable, exportNode) { source && source.forEach(function (sourceSymbol, id) { @@ -24360,10 +24360,10 @@ var ts; } }); } - function getExportsForModule(moduleSymbol) { + function getExportsOfModuleWorker(moduleSymbol) { var visitedSymbols = []; moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); - return visit(moduleSymbol) || moduleSymbol.exports; + return visit(moduleSymbol) || emptySymbols; function visit(symbol) { if (!(symbol && symbol.flags & 1952 && !ts.contains(visitedSymbols, symbol))) { return; @@ -76539,6 +76539,9 @@ var ts; AbstractBuilder.prototype.getFileInfos = function () { return this.fileInfos_doNotAccessDirectly || (this.fileInfos_doNotAccessDirectly = ts.createFileMap()); }; + AbstractBuilder.prototype.hasFileInfos = function () { + return !!this.fileInfos_doNotAccessDirectly; + }; AbstractBuilder.prototype.clear = function () { this.fileInfos_doNotAccessDirectly = undefined; }; @@ -76567,6 +76570,7 @@ var ts; this.getFileInfos().forEachValue(function (_path, value) { return action(value); }); }; AbstractBuilder.prototype.emitFile = function (scriptInfo, writeFile) { + this.ensureFileInfoIfInProject(scriptInfo); var fileInfo = this.getFileInfo(scriptInfo.path); if (!fileInfo) { return false; @@ -76591,7 +76595,20 @@ var ts; _this.project = project; return _this; } + NonModuleBuilder.prototype.ensureFileInfoIfInProject = function (scriptInfo) { + if (this.project.containsScriptInfo(scriptInfo)) { + this.getOrCreateFileInfo(scriptInfo.path); + } + }; NonModuleBuilder.prototype.onProjectUpdateGraph = function () { + var _this = this; + if (this.hasFileInfos()) { + this.forEachFileInfo(function (fileInfo) { + if (!_this.project.containsScriptInfo(fileInfo.scriptInfo)) { + _this.removeFileInfo(fileInfo.scriptInfo.path); + } + }); + } }; NonModuleBuilder.prototype.getFilesAffectedBy = function (scriptInfo) { var info = this.getOrCreateFileInfo(scriptInfo.path); @@ -76680,9 +76697,14 @@ var ts; } return []; }; - ModuleBuilder.prototype.onProjectUpdateGraph = function () { + ModuleBuilder.prototype.ensureFileInfoIfInProject = function (_scriptInfo) { this.ensureProjectDependencyGraphUpToDate(); }; + ModuleBuilder.prototype.onProjectUpdateGraph = function () { + if (this.hasFileInfos()) { + this.ensureProjectDependencyGraphUpToDate(); + } + }; ModuleBuilder.prototype.ensureProjectDependencyGraphUpToDate = function () { var _this = this; if (!this.projectVersionForDependencyGraph || this.project.getProjectVersion() !== this.projectVersionForDependencyGraph) { diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index 2537e5f3577..499638a2618 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -2340,7 +2340,7 @@ declare namespace ts { } } declare namespace ts { - const version = "2.4.1"; + const version = "2.4.2"; } declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any; declare function clearTimeout(handle: any): void; diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 17a5f7886be..1d1a75518a7 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1145,7 +1145,7 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); (function (ts) { var Ternary; @@ -25731,7 +25731,7 @@ var ts; } function getExportsOfModule(moduleSymbol) { var links = getSymbolLinks(moduleSymbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); + return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol)); } function extendExportSymbols(target, source, lookupTable, exportNode) { source && source.forEach(function (sourceSymbol, id) { @@ -25757,10 +25757,10 @@ var ts; } }); } - function getExportsForModule(moduleSymbol) { + function getExportsOfModuleWorker(moduleSymbol) { var visitedSymbols = []; moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); - return visit(moduleSymbol) || moduleSymbol.exports; + return visit(moduleSymbol) || emptySymbols; function visit(symbol) { if (!(symbol && symbol.flags & 1952 && !ts.contains(visitedSymbols, symbol))) { return; @@ -78425,6 +78425,9 @@ var ts; AbstractBuilder.prototype.getFileInfos = function () { return this.fileInfos_doNotAccessDirectly || (this.fileInfos_doNotAccessDirectly = ts.createFileMap()); }; + AbstractBuilder.prototype.hasFileInfos = function () { + return !!this.fileInfos_doNotAccessDirectly; + }; AbstractBuilder.prototype.clear = function () { this.fileInfos_doNotAccessDirectly = undefined; }; @@ -78453,6 +78456,7 @@ var ts; this.getFileInfos().forEachValue(function (_path, value) { return action(value); }); }; AbstractBuilder.prototype.emitFile = function (scriptInfo, writeFile) { + this.ensureFileInfoIfInProject(scriptInfo); var fileInfo = this.getFileInfo(scriptInfo.path); if (!fileInfo) { return false; @@ -78477,7 +78481,20 @@ var ts; _this.project = project; return _this; } + NonModuleBuilder.prototype.ensureFileInfoIfInProject = function (scriptInfo) { + if (this.project.containsScriptInfo(scriptInfo)) { + this.getOrCreateFileInfo(scriptInfo.path); + } + }; NonModuleBuilder.prototype.onProjectUpdateGraph = function () { + var _this = this; + if (this.hasFileInfos()) { + this.forEachFileInfo(function (fileInfo) { + if (!_this.project.containsScriptInfo(fileInfo.scriptInfo)) { + _this.removeFileInfo(fileInfo.scriptInfo.path); + } + }); + } }; NonModuleBuilder.prototype.getFilesAffectedBy = function (scriptInfo) { var info = this.getOrCreateFileInfo(scriptInfo.path); @@ -78566,9 +78583,14 @@ var ts; } return []; }; - ModuleBuilder.prototype.onProjectUpdateGraph = function () { + ModuleBuilder.prototype.ensureFileInfoIfInProject = function (_scriptInfo) { this.ensureProjectDependencyGraphUpToDate(); }; + ModuleBuilder.prototype.onProjectUpdateGraph = function () { + if (this.hasFileInfos()) { + this.ensureProjectDependencyGraphUpToDate(); + } + }; ModuleBuilder.prototype.ensureProjectDependencyGraphUpToDate = function () { var _this = this; if (!this.projectVersionForDependencyGraph || this.project.getProjectVersion() !== this.projectVersionForDependencyGraph) { diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts index 9dc499c2882..73c18cfff70 100644 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts @@ -2594,7 +2594,7 @@ declare namespace ts { } declare namespace ts { /** The version of the TypeScript compiler release */ - const version = "2.4.1"; + const version = "2.4.2"; } declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any; declare function clearTimeout(handle: any): void; diff --git a/lib/typescript.js b/lib/typescript.js index 0f2444e0aad..6d3b150ad5b 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1318,7 +1318,7 @@ var ts; var ts; (function (ts) { /** The version of the TypeScript compiler release */ - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); /* @internal */ (function (ts) { @@ -28322,7 +28322,7 @@ var ts; } function getExportsOfModule(moduleSymbol) { var links = getSymbolLinks(moduleSymbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); + return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol)); } /** * Extends one symbol table with another while collecting information on name collisions for error message generation into the `lookupTable` argument @@ -28352,11 +28352,11 @@ var ts; } }); } - function getExportsForModule(moduleSymbol) { + function getExportsOfModuleWorker(moduleSymbol) { var visitedSymbols = []; // A module defined by an 'export=' consists on one export that needs to be resolved moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); - return visit(moduleSymbol) || moduleSymbol.exports; + return visit(moduleSymbol) || emptySymbols; // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example, // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error. function visit(symbol) { diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts index 1ea738fdcd9..8293eab51d9 100644 --- a/lib/typescriptServices.d.ts +++ b/lib/typescriptServices.d.ts @@ -2594,7 +2594,7 @@ declare namespace ts { } declare namespace ts { /** The version of the TypeScript compiler release */ - const version = "2.4.1"; + const version = "2.4.2"; } declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any; declare function clearTimeout(handle: any): void; diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 0f2444e0aad..6d3b150ad5b 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -1318,7 +1318,7 @@ var ts; var ts; (function (ts) { /** The version of the TypeScript compiler release */ - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); /* @internal */ (function (ts) { @@ -28322,7 +28322,7 @@ var ts; } function getExportsOfModule(moduleSymbol) { var links = getSymbolLinks(moduleSymbol); - return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol)); + return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol)); } /** * Extends one symbol table with another while collecting information on name collisions for error message generation into the `lookupTable` argument @@ -28352,11 +28352,11 @@ var ts; } }); } - function getExportsForModule(moduleSymbol) { + function getExportsOfModuleWorker(moduleSymbol) { var visitedSymbols = []; // A module defined by an 'export=' consists on one export that needs to be resolved moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); - return visit(moduleSymbol) || moduleSymbol.exports; + return visit(moduleSymbol) || emptySymbols; // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example, // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error. function visit(symbol) { diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index c83cde71b53..9c6ca60ad19 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -161,7 +161,7 @@ var ts; })(ts || (ts = {})); var ts; (function (ts) { - ts.version = "2.4.1"; + ts.version = "2.4.2"; })(ts || (ts = {})); (function (ts) { ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator(undefined, { usage: "sort", sensitivity: "accent" }) : undefined;