Skip to content

Commit 3fb8967

Browse files
committed
fix some TS 4.1 errors (#106358)
1 parent ec8016f commit 3fb8967

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/vs/workbench/api/browser/mainThreadMessageService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
3939
}
4040
}
4141

42-
private _showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[], extension: IExtensionDescription | undefined): Promise<number> {
42+
private _showMessage(severity: Severity, message: string, commands: { title: string; isCloseAffordance: boolean; handle: number; }[], extension: IExtensionDescription | undefined): Promise<number | undefined> {
4343

44-
return new Promise<number>(resolve => {
44+
return new Promise<number | undefined>(resolve => {
4545

4646
const primaryActions: MessageItemAction[] = [];
4747

src/vs/workbench/services/progress/browser/progressService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ export class ProgressService extends Disposable implements IProgressService {
224224
// Create a promise that we can resolve as needed
225225
// when the outside calls dispose on us
226226
let promiseResolve: () => void;
227-
const promise = new Promise<R>(resolve => promiseResolve = resolve);
227+
const promise = new Promise<void>(resolve => promiseResolve = resolve);
228228

229-
this.withWindowProgress<R>({
229+
this.withWindowProgress({
230230
location: ProgressLocation.Window,
231231
title: options.title ? parseLinkedText(options.title).toString() : undefined, // convert markdown links => string
232232
command: 'notifications.showList'

src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
307307
);
308308
}
309309

310-
abstract async enterWorkspace(path: URI): Promise<void>;
310+
abstract enterWorkspace(path: URI): Promise<void>;
311311

312312
protected async doEnterWorkspace(path: URI): Promise<IEnterWorkspaceResult | null> {
313313
if (!!this.environmentService.extensionTestsLocationURI) {

0 commit comments

Comments
 (0)