Skip to content

Commit e9dd25e

Browse files
author
Benjamin Pasero
committed
window - align interfaces for opening
1 parent 9721b4a commit e9dd25e

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

‎src/vs/platform/electron/common/electron.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { Event } from 'vs/base/common/event';
77
import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, SaveDialogOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogReturnValue, CrashReporterStartOptions } from 'vs/base/parts/sandbox/common/electronTypes';
8-
import { IOpenedWindow, IWindowOpenable, IOpenEmptyWindowOptions, INativeOpenWindowOptions } from 'vs/platform/windows/common/windows';
8+
import { IOpenedWindow, IWindowOpenable, IOpenEmptyWindowOptions, IOpenWindowOptions } from 'vs/platform/windows/common/windows';
99
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
1010
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1111

@@ -31,7 +31,7 @@ export interface ICommonElectronService {
3131
getActiveWindowId(): Promise<number | undefined>;
3232

3333
openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
34-
openWindow(toOpen: IWindowOpenable[], options?: INativeOpenWindowOptions): Promise<void>;
34+
openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
3535

3636
toggleFullScreen(): Promise<void>;
3737

‎src/vs/platform/electron/electron-main/electronMainService.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-m
88
import { MessageBoxOptions, MessageBoxReturnValue, shell, OpenDevToolsOptions, SaveDialogOptions, SaveDialogReturnValue, OpenDialogOptions, OpenDialogReturnValue, CrashReporterStartOptions, crashReporter, Menu, BrowserWindow, app, clipboard } from 'electron';
99
import { OpenContext } from 'vs/platform/windows/node/window';
1010
import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
11-
import { IOpenedWindow, INativeOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
11+
import { IOpenedWindow, IOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
1212
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
1313
import { isMacintosh } from 'vs/base/common/platform';
1414
import { ICommonElectronService } from 'vs/platform/electron/common/electron';
@@ -91,16 +91,16 @@ export class ElectronMainService implements IElectronMainService {
9191
}
9292

9393
openWindow(windowId: number | undefined, options?: IOpenEmptyWindowOptions): Promise<void>;
94-
openWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options?: INativeOpenWindowOptions): Promise<void>;
95-
openWindow(windowId: number | undefined, arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: INativeOpenWindowOptions): Promise<void> {
94+
openWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
95+
openWindow(windowId: number | undefined, arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> {
9696
if (Array.isArray(arg1)) {
9797
return this.doOpenWindow(windowId, arg1, arg2);
9898
}
9999

100100
return this.doOpenEmptyWindow(windowId, arg1);
101101
}
102102

103-
private async doOpenWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options: INativeOpenWindowOptions = Object.create(null)): Promise<void> {
103+
private async doOpenWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options: IOpenWindowOptions = Object.create(null)): Promise<void> {
104104
if (toOpen.length > 0) {
105105
this.windowsMainService.open({
106106
context: OpenContext.API,

‎src/vs/platform/windows/common/windows.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
2020

2121
noRecentEntry?: boolean;
2222

23-
diffMode?: boolean;
24-
gotoLineMode?: boolean;
25-
}
23+
addMode?: boolean;
2624

27-
export interface INativeOpenWindowOptions extends IOpenWindowOptions {
2825
diffMode?: boolean;
29-
addMode?: boolean;
3026
gotoLineMode?: boolean;
27+
3128
waitMarkerFileURI?: URI;
3229
}
3330

0 commit comments

Comments
 (0)