microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-11 10:00:13 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Update LKG

Browse Source
This commit is contained in:
Mohamed Hegazy 2017-11-27 12:04:36 -08:00
parent 2c6ccc9a73
commit 7790c96e30
7 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tsc.js
View File

@ -152,7 +152,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.6";
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {

12
lib/tsserver.js
View File

@ -1182,7 +1182,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.6";
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
@ -81335,8 +81335,8 @@ var ts;
(function (server) {
server.ActionSet = "action::set";
server.ActionInvalidate = "action::invalidate";
server.ActionPackageInstalled = "action::packageInstalled";
server.EventTypesRegistry = "event::typesRegistry";
server.EventPackageInstalled = "event::packageInstalled";
server.EventBeginInstallTypes = "event::beginInstallTypes";
server.EventEndInstallTypes = "event::endInstallTypes";
server.EventInitializationFailed = "event::initializationFailed";
@ -82871,7 +82871,7 @@ var ts;
return this.typingsCache.isKnownTypesPackageName(name);
};
Project.prototype.installPackage = function (options) {
return this.typingsCache.installPackage(__assign({}, options, { projectRootPath: this.toPath(this.currentDirectory) }));
return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) }));
};
Object.defineProperty(Project.prototype, "typingsCache", {
get: function () {
@ -88088,7 +88088,7 @@ var ts;
case server.EventTypesRegistry:
this.typesRegistryCache = ts.createMapFromTemplate(response.typesRegistry);
break;
case server.EventPackageInstalled: {
case server.ActionPackageInstalled: {
var success = response.success, message = response.message;
if (success) {
this.packageInstalledPromise.resolve({ successMessage: message });
@ -88097,6 +88097,10 @@ var ts;
this.packageInstalledPromise.reject(message);
}
this.packageInstalledPromise = undefined;
this.projectService.updateTypingsForProject(response);
if (this.socket) {
this.sendEvent(0, "setTypings", response);
}
break;
}
case server.EventInitializationFailed:

22
lib/tsserverlibrary.d.ts vendored
View File

@ -4699,7 +4699,7 @@ declare namespace ts.server {
interface TypesRegistryRequest {
readonly kind: "typesRegistry";
}
interface InstallPackageRequest {
interface InstallPackageRequest extends TypingInstallerRequestWithProjectName {
readonly kind: "installPackage";
readonly fileName: Path;
readonly packageName: string;
@ -4707,13 +4707,18 @@ declare namespace ts.server {
}
type ActionSet = "action::set";
type ActionInvalidate = "action::invalidate";
type ActionPackageInstalled = "action::packageInstalled";
type EventTypesRegistry = "event::typesRegistry";
type EventPackageInstalled = "event::packageInstalled";
type EventBeginInstallTypes = "event::beginInstallTypes";
type EventEndInstallTypes = "event::endInstallTypes";
type EventInitializationFailed = "event::initializationFailed";
interface TypingInstallerResponse {
readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | EventPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
}
interface PackageInstalledResponse extends ProjectResponse {
readonly kind: ActionPackageInstalled;
readonly success: boolean;
readonly message: string;
}
interface InitializationFailedResponse extends TypingInstallerResponse {
readonly kind: EventInitializationFailed;
@ -4749,8 +4754,8 @@ declare namespace ts.server {
declare namespace ts.server {
const ActionSet: ActionSet;
const ActionInvalidate: ActionInvalidate;
const ActionPackageInstalled: ActionPackageInstalled;
const EventTypesRegistry: EventTypesRegistry;
const EventPackageInstalled: EventPackageInstalled;
const EventBeginInstallTypes: EventBeginInstallTypes;
const EventEndInstallTypes: EventEndInstallTypes;
const EventInitializationFailed: EventInitializationFailed;
@ -7092,12 +7097,13 @@ declare namespace ts.server {
}
}
declare namespace ts.server {
interface InstallPackageOptionsWithProjectRootPath extends InstallPackageOptions {
interface InstallPackageOptionsWithProject extends InstallPackageOptions {
projectName: string;
projectRootPath: Path;
}
interface ITypingsInstaller {
isKnownTypesPackageName(name: string): boolean;
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult>;
installPackage(options: InstallPackageOptionsWithProject): Promise<ApplyCodeActionCommandResult>;
enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void;
attach(projectService: ProjectService): void;
onProjectClosed(p: Project): void;
@ -7109,7 +7115,7 @@ declare namespace ts.server {
private readonly perProjectCache;
constructor(installer: ITypingsInstaller);
isKnownTypesPackageName(name: string): boolean;
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult>;
installPackage(options: InstallPackageOptionsWithProject): Promise<ApplyCodeActionCommandResult>;
getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string>;
updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]): void;
deleteTypingsForProject(projectName: string): void;
@ -7537,7 +7543,7 @@ declare namespace ts.server {
private createWatcherLog(watchType, project);
toPath(fileName: string): Path;
private loadTypesMap();
updateTypingsForProject(response: SetTypings | InvalidateCachedTypings): void;
updateTypingsForProject(response: SetTypings | InvalidateCachedTypings | PackageInstalledResponse): void;
private delayInferredProjectsRefresh();
private delayUpdateProjectGraph(project);
private sendProjectsUpdatedInBackgroundEvent();

6
lib/tsserverlibrary.js
View File

@ -1368,7 +1368,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.6";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
@ -97193,8 +97193,8 @@ var ts;
(function (server) {
server.ActionSet = "action::set";
server.ActionInvalidate = "action::invalidate";
server.ActionPackageInstalled = "action::packageInstalled";
server.EventTypesRegistry = "event::typesRegistry";
server.EventPackageInstalled = "event::packageInstalled";
server.EventBeginInstallTypes = "event::beginInstallTypes";
server.EventEndInstallTypes = "event::endInstallTypes";
server.EventInitializationFailed = "event::initializationFailed";
@ -101509,7 +101509,7 @@ var ts;
return this.typingsCache.isKnownTypesPackageName(name);
};
Project.prototype.installPackage = function (options) {
return this.typingsCache.installPackage(__assign({}, options, { projectRootPath: this.toPath(this.currentDirectory) }));
return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) }));
};
Object.defineProperty(Project.prototype, "typingsCache", {
get: function () {

2
lib/typescript.js
View File

@ -1368,7 +1368,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.6";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {

2
lib/typescriptServices.js
View File

@ -1368,7 +1368,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.6";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {

13
lib/typingsInstaller.js
View File

@ -162,7 +162,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.6";
ts.version = ts.versionMajorMinor + ".2";
ts.version = ts.versionMajorMinor + ".3";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
@ -17445,8 +17445,8 @@ var ts;
(function (server) {
server.ActionSet = "action::set";
server.ActionInvalidate = "action::invalidate";
server.ActionPackageInstalled = "action::packageInstalled";
server.EventTypesRegistry = "event::typesRegistry";
server.EventPackageInstalled = "event::packageInstalled";
server.EventBeginInstallTypes = "event::beginInstallTypes";
server.EventEndInstallTypes = "event::endInstallTypes";
server.EventInitializationFailed = "event::initializationFailed";
@ -18509,8 +18509,9 @@ var ts;
var filteredTypings = this.filterTypings(typingsToInstall);
if (filteredTypings.length === 0) {
if (this.log.isEnabled()) {
this.log.writeLine("All typings are known to be missing or invalid - no need to go any further");
this.log.writeLine("All typings are known to be missing or invalid - no need to install more typings");
}
this.sendResponse(this.createSetTypings(req, currentlyCachedTypings));
return;
}
this.ensurePackageDirectoryExists(cachePath);
@ -18757,17 +18758,17 @@ var ts;
break;
}
case "installPackage": {
var fileName = req.fileName, packageName_1 = req.packageName, projectRootPath = req.projectRootPath;
var fileName = req.fileName, packageName_1 = req.packageName, projectName_1 = req.projectName, projectRootPath = req.projectRootPath;
var cwd = getDirectoryOfPackageJson(fileName, _this.installTypingHost) || projectRootPath;
if (cwd) {
_this.installWorker(-1, [packageName_1], cwd, function (success) {
var message = success ? "Package " + packageName_1 + " installed." : "There was an error installing " + packageName_1 + ".";
var response = { kind: server.EventPackageInstalled, success: success, message: message };
var response = { kind: server.ActionPackageInstalled, projectName: projectName_1, success: success, message: message };
_this.sendResponse(response);
});
}
else {
var response = { kind: server.EventPackageInstalled, success: false, message: "Could not determine a project root path." };
var response = { kind: server.ActionPackageInstalled, projectName: projectName_1, success: false, message: "Could not determine a project root path." };
_this.sendResponse(response);
}
break;