From c5bb882ad9e8e298f5c0d0eaa53560f00f817fef Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Wed, 18 Oct 2017 13:35:25 -0700 Subject: [PATCH] Use Promise instead of PromiseLike --- src/server/project.ts | 2 +- src/server/server.ts | 2 +- src/server/typingsCache.ts | 4 ++-- src/services/services.ts | 2 +- src/services/types.ts | 4 ++-- tests/baselines/reference/api/tsserverlibrary.d.ts | 10 +++++----- tests/baselines/reference/api/typescript.d.ts | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/server/project.ts b/src/server/project.ts index 725ce725c3881..9bf168106ad14 100644 --- a/src/server/project.ts +++ b/src/server/project.ts @@ -245,7 +245,7 @@ namespace ts.server { isKnownTypesPackageName(name: string): boolean { return this.typingsCache.isKnownTypesPackageName(name); } - installPackage(options: InstallPackageOptions): PromiseLike { + installPackage(options: InstallPackageOptions): Promise { return this.typingsCache.installPackage({ ...options, projectRootPath: this.toPath(this.currentDirectory) }); } private get typingsCache(): TypingsCache { diff --git a/src/server/server.ts b/src/server/server.ts index decf614cf8ea7..7ab2218848a9a 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -297,7 +297,7 @@ namespace ts.server { return false; } - installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike { + installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise { const rq: InstallPackageRequest = { kind: "installPackage", ...options }; this.send(rq); Debug.assert(this.packageInstalledPromise === undefined); diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts index ddcf85063fdda..d6eeaa2cbcf2b 100644 --- a/src/server/typingsCache.ts +++ b/src/server/typingsCache.ts @@ -7,7 +7,7 @@ namespace ts.server { export interface ITypingsInstaller { isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike; + installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise; enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray): void; attach(projectService: ProjectService): void; onProjectClosed(p: Project): void; @@ -90,7 +90,7 @@ namespace ts.server { return this.installer.isKnownTypesPackageName(name); } - installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike { + installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise { return this.installer.installPackage(options); } diff --git a/src/services/services.ts b/src/services/services.ts index 114692ebba2e5..4008c403f26e8 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1763,7 +1763,7 @@ namespace ts { }); } - function applyCodeActionCommand(fileName: Path, action: CodeActionCommand): PromiseLike { + function applyCodeActionCommand(fileName: Path, action: CodeActionCommand): Promise { fileName = toPath(fileName, currentDirectory, getCanonicalFileName); switch (action.type) { case "install package": diff --git a/src/services/types.ts b/src/services/types.ts index 7ec559be92283..1b37d88d23712 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -204,7 +204,7 @@ namespace ts { getCustomTransformers?(): CustomTransformers | undefined; isKnownTypesPackageName?(name: string): boolean; - installPackage?(options: InstallPackageOptions): PromiseLike; + installPackage?(options: InstallPackageOptions): Promise; } // @@ -282,7 +282,7 @@ namespace ts { getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan; getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[]; - applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike; + applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise; getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[]; getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 52132ae832f25..731e28cdfeaed 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3901,7 +3901,7 @@ declare namespace ts { */ getCustomTransformers?(): CustomTransformers | undefined; isKnownTypesPackageName?(name: string): boolean; - installPackage?(options: InstallPackageOptions): PromiseLike; + installPackage?(options: InstallPackageOptions): Promise; } interface LanguageService { cleanupSemanticCache(): void; @@ -3949,7 +3949,7 @@ declare namespace ts { isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean; getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan; getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[]; - applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike; + applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise; getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[]; getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined; getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput; @@ -7066,7 +7066,7 @@ declare namespace ts.server { } interface ITypingsInstaller { isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike; + installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise; enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray): void; attach(projectService: ProjectService): void; onProjectClosed(p: Project): void; @@ -7078,7 +7078,7 @@ declare namespace ts.server { private readonly perProjectCache; constructor(installer: ITypingsInstaller); isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike; + installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise; getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray, forceRefresh: boolean): SortedReadonlyArray; updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray, newTypings: string[]): void; deleteTypingsForProject(projectName: string): void; @@ -7174,7 +7174,7 @@ declare namespace ts.server { getCachedUnresolvedImportsPerFile_TestOnly(): UnresolvedImportsMap; static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {}; isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptions): PromiseLike; + installPackage(options: InstallPackageOptions): Promise; private readonly typingsCache; getCompilationSettings(): CompilerOptions; getCompilerOptions(): CompilerOptions; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 976d50942ae1b..acc4cf8a2ff87 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -3901,7 +3901,7 @@ declare namespace ts { */ getCustomTransformers?(): CustomTransformers | undefined; isKnownTypesPackageName?(name: string): boolean; - installPackage?(options: InstallPackageOptions): PromiseLike; + installPackage?(options: InstallPackageOptions): Promise; } interface LanguageService { cleanupSemanticCache(): void; @@ -3949,7 +3949,7 @@ declare namespace ts { isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean; getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan; getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[]; - applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike; + applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise; getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[]; getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined; getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;