Skip to content

Commit a00d19d

Browse files
committed
fix: merge issues
1 parent 5be69a0 commit a00d19d

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

src/common/window.apis.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -333,22 +333,6 @@ export function showWarningMessage(message: string, ...items: any[]): Thenable<s
333333
return window.showWarningMessage(message, ...items);
334334
}
335335

336-
export function showErrorMessage<T extends string>(message: string, ...items: T[]): Thenable<T | undefined>;
337-
export function showErrorMessage<T extends string>(
338-
message: string,
339-
options: MessageOptions,
340-
...items: T[]
341-
): Thenable<T | undefined>;
342-
export function showErrorMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
343-
export function showErrorMessage<T extends MessageItem>(
344-
message: string,
345-
options: MessageOptions,
346-
...items: T[]
347-
): Thenable<T | undefined>;
348-
export function showErrorMessage(message: string, ...items: any[]): Thenable<string | undefined> {
349-
return window.showErrorMessage(message, ...items);
350-
}
351-
352336
export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined> {
353337
return window.showInputBox(options, token);
354338
}

0 commit comments

Comments
 (0)