From d795b8b40325e7373e159aa5ddfd2ae2af169451 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 8 Apr 2019 13:58:34 -0700 Subject: [PATCH] Update LKG. --- lib/protocol.d.ts | 2 ++ lib/tsc.js | 2 +- lib/tsserver.js | 13 ++++++++----- lib/tsserverlibrary.d.ts | 2 ++ lib/tsserverlibrary.js | 9 ++++++--- lib/typescript.js | 2 +- lib/typescriptServices.js | 2 +- lib/typingsInstaller.js | 2 +- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/protocol.d.ts b/lib/protocol.d.ts index 38c0989c362..ae75d5d39bd 100644 --- a/lib/protocol.d.ts +++ b/lib/protocol.d.ts @@ -1024,6 +1024,8 @@ declare namespace ts.server.protocol { command: CommandTypes.ConfigurePlugin; arguments: ConfigurePluginRequestArguments; } + interface ConfigurePluginResponse extends Response { + } /** * Information found in an "open" request. */ diff --git a/lib/tsc.js b/lib/tsc.js index 01f969133ef..512fecfcd2c 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook var ts; (function (ts) { ts.versionMajorMinor = "3.4"; - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { ts.emptyArray = []; diff --git a/lib/tsserver.js b/lib/tsserver.js index 3f0dbdb85aa..1c39c0df249 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -85,7 +85,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.4"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -125708,12 +125708,13 @@ var ts; var ExternalProject = /** @class */ (function (_super) { __extends(ExternalProject, _super); /*@internal*/ - function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath) { + function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, pluginConfigOverrides) { var _this = _super.call(this, externalProjectName, ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, projectService.host, ts.getDirectoryPath(projectFilePath || ts.normalizeSlashes(externalProjectName))) || this; _this.externalProjectName = externalProjectName; _this.compileOnSaveEnabled = compileOnSaveEnabled; _this.excludedFiles = []; + _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides); return _this; } ExternalProject.prototype.updateGraph = function () { @@ -126934,7 +126935,8 @@ var ts; ProjectService.prototype.createExternalProject = function (projectFileName, files, options, typeAcquisition, excludedFiles) { var compilerOptions = convertCompilerOptions(options); var project = new server.ExternalProject(projectFileName, this, this.documentRegistry, compilerOptions, - /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave); + /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave, + /*projectFilePath*/ undefined, this.currentPluginConfigOverrides); project.excludedFiles = excludedFiles; this.addFilesToNonInferredProject(project, files, externalFilePropertyReader, typeAcquisition); this.externalProjects.push(project); @@ -129071,6 +129073,7 @@ var ts; }, _a[server.CommandNames.ConfigurePlugin] = function (request) { _this.configurePlugin(request.arguments); + _this.doOutput(/*info*/ undefined, server.CommandNames.ConfigurePlugin, request.seq, /*success*/ true); return _this.notRequired(); }, _a)); @@ -131332,7 +131335,7 @@ var ts; process.env.USERPROFILE || (process.env.HOMEDRIVE && process.env.HOMEPATH && ts.normalizeSlashes(process.env.HOMEDRIVE + process.env.HOMEPATH)) || os.tmpdir(); - return ts.combinePaths(ts.combinePaths(ts.normalizeSlashes(basePath), "Microsoft/TypeScript"), ts.versionMajorMinor); + return ts.combinePaths(ts.combinePaths(ts.normalizeSlashes(basePath), "Microsoft/TypeScript"), ts.version); } case "openbsd": case "freebsd": @@ -131340,7 +131343,7 @@ var ts; case "linux": case "android": { var cacheLocation = getNonWindowsCacheLocation(process.platform === "darwin"); - return ts.combinePaths(ts.combinePaths(cacheLocation, "typescript"), ts.versionMajorMinor); + return ts.combinePaths(ts.combinePaths(cacheLocation, "typescript"), ts.version); } default: return ts.Debug.fail("unsupported platform '" + process.platform + "'"); diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index 8208cdba2ab..59fa706bf45 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -6748,6 +6748,8 @@ declare namespace ts.server.protocol { command: CommandTypes.ConfigurePlugin; arguments: ConfigurePluginRequestArguments; } + interface ConfigurePluginResponse extends Response { + } /** * Information found in an "open" request. */ diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 28b86d2daab..9506319a806 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -84,7 +84,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.4"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -125707,12 +125707,13 @@ var ts; var ExternalProject = /** @class */ (function (_super) { __extends(ExternalProject, _super); /*@internal*/ - function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath) { + function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, pluginConfigOverrides) { var _this = _super.call(this, externalProjectName, ProjectKind.External, projectService, documentRegistry, /*hasExplicitListOfFiles*/ true, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, projectService.host, ts.getDirectoryPath(projectFilePath || ts.normalizeSlashes(externalProjectName))) || this; _this.externalProjectName = externalProjectName; _this.compileOnSaveEnabled = compileOnSaveEnabled; _this.excludedFiles = []; + _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides); return _this; } ExternalProject.prototype.updateGraph = function () { @@ -126933,7 +126934,8 @@ var ts; ProjectService.prototype.createExternalProject = function (projectFileName, files, options, typeAcquisition, excludedFiles) { var compilerOptions = convertCompilerOptions(options); var project = new server.ExternalProject(projectFileName, this, this.documentRegistry, compilerOptions, - /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave); + /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave, + /*projectFilePath*/ undefined, this.currentPluginConfigOverrides); project.excludedFiles = excludedFiles; this.addFilesToNonInferredProject(project, files, externalFilePropertyReader, typeAcquisition); this.externalProjects.push(project); @@ -129070,6 +129072,7 @@ var ts; }, _a[server.CommandNames.ConfigurePlugin] = function (request) { _this.configurePlugin(request.arguments); + _this.doOutput(/*info*/ undefined, server.CommandNames.ConfigurePlugin, request.seq, /*success*/ true); return _this.notRequired(); }, _a)); diff --git a/lib/typescript.js b/lib/typescript.js index 4d889bf8e89..da4767072f7 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.4"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 189e52ff8a5..6da9625d975 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.4"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 14fd15b6436..d7fd676a74f 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -76,7 +76,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.4"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { /* @internal */