Skip to content

Commit ddf6ed3

Browse files
jriekenjrieken
committed
more strictFunctions microsoft#81574 
1 parent 48e5c5b commit ddf6ed3

4 files changed

Lines changed: 21 additions & 15 deletions

File tree

‎src/vs/workbench/api/common/extHost.api.impl.ts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,14 +475,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
475475
onDidChangeWindowState(listener, thisArg?, disposables?) {
476476
return extHostWindow.onDidChangeWindowState(listener, thisArg, disposables);
477477
},
478-
showInformationMessage(message: string, first: vscode.MessageOptions | string | vscode.MessageItem, ...rest: Array<string | vscode.MessageItem>) {
479-
return extHostMessageService.showMessage(extension, Severity.Info, message, first, rest);
478+
showInformationMessage(message: string, ...rest: Array<vscode.MessageOptions | string | vscode.MessageItem>) {
479+
return <Thenable<any>>extHostMessageService.showMessage(extension, Severity.Info, message, rest[0], <Array<string | vscode.MessageItem>>rest.slice(1));
480480
},
481-
showWarningMessage(message: string, first: vscode.MessageOptions | string | vscode.MessageItem, ...rest: Array<string | vscode.MessageItem>) {
482-
return extHostMessageService.showMessage(extension, Severity.Warning, message, first, rest);
481+
showWarningMessage(message: string, ...rest: Array<vscode.MessageOptions | string | vscode.MessageItem>) {
482+
return <Thenable<any>>extHostMessageService.showMessage(extension, Severity.Warning, message, rest[0], <Array<string | vscode.MessageItem>>rest.slice(1));
483483
},
484-
showErrorMessage(message: string, first: vscode.MessageOptions | string | vscode.MessageItem, ...rest: Array<string | vscode.MessageItem>) {
485-
return extHostMessageService.showMessage(extension, Severity.Error, message, first, rest);
484+
showErrorMessage(message: string, ...rest: Array<vscode.MessageOptions | string | vscode.MessageItem>) {
485+
return <Thenable<any>>extHostMessageService.showMessage(extension, Severity.Error, message, rest[0], <Array<string | vscode.MessageItem>>rest.slice(1));
486486
},
487487
showQuickPick(items: any, options?: vscode.QuickPickOptions, token?: vscode.CancellationToken): any {
488488
return extHostQuickOpen.showQuickPick(items, !!extension.enableProposedApi, options, token);
@@ -533,7 +533,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
533533
createOutputChannel(name: string): vscode.OutputChannel {
534534
return extHostOutputService.createOutputChannel(name);
535535
},
536-
createWebviewPanel(viewType: string, title: string, showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean }, options: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
536+
createWebviewPanel(viewType: string, title: string, showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn, preserveFocus?: boolean }, options?: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
537537
return extHostWebviews.createWebviewPanel(extension, viewType, title, showOptions, options);
538538
},
539539
createWebviewTextEditorInset(editor: vscode.TextEditor, line: number, height: number, options?: vscode.WebviewOptions): vscode.WebviewEditorInset {
@@ -751,7 +751,12 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
751751
},
752752
openTunnel: (forward: vscode.TunnelOptions) => {
753753
checkProposedApiEnabled(extension);
754-
return extHostTunnelService.openTunnel(forward);
754+
return extHostTunnelService.openTunnel(forward).then(value => {
755+
if (!value) {
756+
throw new Error('cannot open tunnel');
757+
}
758+
return value;
759+
});
755760
},
756761
get tunnels() {
757762
checkProposedApiEnabled(extension);

‎src/vs/workbench/api/common/extHostMessageService.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ export class ExtHostMessageService {
2424
this._proxy = mainContext.getProxy(MainContext.MainThreadMessageService);
2525
}
2626

27-
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string, rest: string[]): Promise<string | undefined>;
28-
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem, rest: vscode.MessageItem[]): Promise<vscode.MessageItem | undefined>;
29-
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem | string, rest: Array<vscode.MessageItem | string>): Promise<string | vscode.MessageItem | undefined>;
30-
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string | vscode.MessageItem, rest: Array<string | vscode.MessageItem>): Promise<string | vscode.MessageItem | undefined> {
27+
28+
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string | undefined, rest: string[]): Promise<string | undefined>;
29+
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem | undefined, rest: vscode.MessageItem[]): Promise<vscode.MessageItem | undefined>;
30+
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | vscode.MessageItem | string | undefined, rest: Array<vscode.MessageItem | string>): Promise<string | vscode.MessageItem | undefined>;
31+
showMessage(extension: IExtensionDescription, severity: Severity, message: string, optionsOrFirstItem: vscode.MessageOptions | string | vscode.MessageItem | undefined, rest: Array<string | vscode.MessageItem>): Promise<string | vscode.MessageItem | undefined> {
3132

3233
const options: MainThreadMessageOptions = { extension };
3334
let items: (string | vscode.MessageItem)[];

‎src/vs/workbench/contrib/quickopen/browser/gotoSymbolHandler.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class OutlineModel extends QuickOpenModel {
7777
const searchValuePos = searchValue.indexOf(SCOPE_PREFIX) === 0 ? 1 : 0;
7878

7979
// Check for match and update visibility and group label
80-
this.entries.forEach((entry: SymbolEntry) => {
80+
(<Array<SymbolEntry>>this.entries).forEach(entry => {
8181

8282
// Clear all state first
8383
entry.setGroupLabel(undefined);
@@ -98,7 +98,7 @@ class OutlineModel extends QuickOpenModel {
9898
});
9999

100100
// select comparator based on the presence of the colon-prefix
101-
this.entries.sort(searchValuePos === 0
101+
(<Array<SymbolEntry>>this.entries).sort(searchValuePos === 0
102102
? SymbolEntry.compareByRank
103103
: SymbolEntry.compareByKindAndRank
104104
);

‎src/vs/workbench/contrib/themes/browser/themes.contribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ function isItem(i: QuickPickInput<ThemeItem>): i is ThemeItem {
228228
}
229229

230230
function toEntries(themes: Array<IColorTheme | IFileIconTheme>, label?: string): QuickPickInput<ThemeItem>[] {
231-
const toEntry = (theme: IColorTheme): ThemeItem => ({ id: theme.id, label: theme.label, description: theme.description });
231+
const toEntry = (theme: IColorTheme | IFileIconTheme): ThemeItem => ({ id: theme.id, label: theme.label, description: theme.description });
232232
const sorter = (t1: ThemeItem, t2: ThemeItem) => t1.label.localeCompare(t2.label);
233233
let entries: QuickPickInput<ThemeItem>[] = themes.map(toEntry).sort(sorter);
234234
if (entries.length > 0 && label) {

0 commit comments

Comments
 (0)