Skip to content

Commit 0f55f4a

Browse files
author
Andy
authored
Use Promise instead of PromiseLike (microsoft#19305)
1 parent 6c1afba commit 0f55f4a

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎src/server/project.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ namespace ts.server {
245245
isKnownTypesPackageName(name: string): boolean {
246246
return this.typingsCache.isKnownTypesPackageName(name);
247247
}
248-
installPackage(options: InstallPackageOptions): PromiseLike<ApplyCodeActionCommandResult> {
248+
installPackage(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult> {
249249
return this.typingsCache.installPackage({ ...options, projectRootPath: this.toPath(this.currentDirectory) });
250250
}
251251
private get typingsCache(): TypingsCache {

‎src/server/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ namespace ts.server {
297297
return false;
298298
}
299299

300-
installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike<ApplyCodeActionCommandResult> {
300+
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult> {
301301
const rq: InstallPackageRequest = { kind: "installPackage", ...options };
302302
this.send(rq);
303303
Debug.assert(this.packageInstalledPromise === undefined);

‎src/server/typingsCache.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ts.server {
77

88
export interface ITypingsInstaller {
99
isKnownTypesPackageName(name: string): boolean;
10-
installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike<ApplyCodeActionCommandResult>;
10+
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult>;
1111
enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void;
1212
attach(projectService: ProjectService): void;
1313
onProjectClosed(p: Project): void;
@@ -90,7 +90,7 @@ namespace ts.server {
9090
return this.installer.isKnownTypesPackageName(name);
9191
}
9292

93-
installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike<ApplyCodeActionCommandResult> {
93+
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult> {
9494
return this.installer.installPackage(options);
9595
}
9696

‎src/services/services.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@ namespace ts {
17631763
});
17641764
}
17651765

1766-
function applyCodeActionCommand(fileName: Path, action: CodeActionCommand): PromiseLike<ApplyCodeActionCommandResult> {
1766+
function applyCodeActionCommand(fileName: Path, action: CodeActionCommand): Promise<ApplyCodeActionCommandResult> {
17671767
fileName = toPath(fileName, currentDirectory, getCanonicalFileName);
17681768
switch (action.type) {
17691769
case "install package":

‎src/services/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ namespace ts {
205205
getCustomTransformers?(): CustomTransformers | undefined;
206206

207207
isKnownTypesPackageName?(name: string): boolean;
208-
installPackage?(options: InstallPackageOptions): PromiseLike<ApplyCodeActionCommandResult>;
208+
installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
209209
}
210210

211211
//
@@ -283,7 +283,7 @@ namespace ts {
283283
getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
284284

285285
getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
286-
applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike<ApplyCodeActionCommandResult>;
286+
applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
287287
getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[];
288288
getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined;
289289

‎tests/baselines/reference/api/tsserverlibrary.d.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3902,7 +3902,7 @@ declare namespace ts {
39023902
*/
39033903
getCustomTransformers?(): CustomTransformers | undefined;
39043904
isKnownTypesPackageName?(name: string): boolean;
3905-
installPackage?(options: InstallPackageOptions): PromiseLike<ApplyCodeActionCommandResult>;
3905+
installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
39063906
}
39073907
interface LanguageService {
39083908
cleanupSemanticCache(): void;
@@ -3950,7 +3950,7 @@ declare namespace ts {
39503950
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
39513951
getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
39523952
getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
3953-
applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike<ApplyCodeActionCommandResult>;
3953+
applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
39543954
getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[];
39553955
getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined;
39563956
getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
@@ -7067,7 +7067,7 @@ declare namespace ts.server {
70677067
}
70687068
interface ITypingsInstaller {
70697069
isKnownTypesPackageName(name: string): boolean;
7070-
installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike<ApplyCodeActionCommandResult>;
7070+
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult>;
70717071
enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void;
70727072
attach(projectService: ProjectService): void;
70737073
onProjectClosed(p: Project): void;
@@ -7079,7 +7079,7 @@ declare namespace ts.server {
70797079
private readonly perProjectCache;
70807080
constructor(installer: ITypingsInstaller);
70817081
isKnownTypesPackageName(name: string): boolean;
7082-
installPackage(options: InstallPackageOptionsWithProjectRootPath): PromiseLike<ApplyCodeActionCommandResult>;
7082+
installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise<ApplyCodeActionCommandResult>;
70837083
getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string>;
70847084
updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]): void;
70857085
deleteTypingsForProject(projectName: string): void;
@@ -7175,7 +7175,7 @@ declare namespace ts.server {
71757175
getCachedUnresolvedImportsPerFile_TestOnly(): UnresolvedImportsMap;
71767176
static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {};
71777177
isKnownTypesPackageName(name: string): boolean;
7178-
installPackage(options: InstallPackageOptions): PromiseLike<ApplyCodeActionCommandResult>;
7178+
installPackage(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
71797179
private readonly typingsCache;
71807180
getCompilationSettings(): CompilerOptions;
71817181
getCompilerOptions(): CompilerOptions;

‎tests/baselines/reference/api/typescript.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3902,7 +3902,7 @@ declare namespace ts {
39023902
*/
39033903
getCustomTransformers?(): CustomTransformers | undefined;
39043904
isKnownTypesPackageName?(name: string): boolean;
3905-
installPackage?(options: InstallPackageOptions): PromiseLike<ApplyCodeActionCommandResult>;
3905+
installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
39063906
}
39073907
interface LanguageService {
39083908
cleanupSemanticCache(): void;
@@ -3950,7 +3950,7 @@ declare namespace ts {
39503950
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
39513951
getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan;
39523952
getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: number[], formatOptions: FormatCodeSettings): CodeAction[];
3953-
applyCodeActionCommand(fileName: string, action: CodeActionCommand): PromiseLike<ApplyCodeActionCommandResult>;
3953+
applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
39543954
getApplicableRefactors(fileName: string, positionOrRaneg: number | TextRange): ApplicableRefactorInfo[];
39553955
getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string): RefactorEditInfo | undefined;
39563956
getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;

0 commit comments

Comments
 (0)