Skip to content

Commit db8a4cb

Browse files
chrmartichrmarti
committed
Cleanup (microsoft#20671)
1 parent 160bd44 commit db8a4cb

8 files changed

Lines changed: 37 additions & 33 deletions

File tree

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ import Event from 'vs/base/common/event';
77
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
88
import { IWindowsService } from 'vs/platform/windows/common/windows';
99

10+
export enum OpenContext {
11+
12+
// opening when running from the command line
13+
CLI,
14+
15+
// macOS only: opening from the dock (also when opening files to a running instance from desktop)
16+
DOCK,
17+
18+
// opening from the main application window
19+
MENU,
20+
21+
// opening from a file or folder dialog
22+
DIALOG,
23+
24+
// opening from the OS's UI
25+
DESKTOP,
26+
27+
// opening through the API
28+
API
29+
}
30+
1031
export interface IWindowEventService {
1132
_serviceBrand: any;
1233

‎src/vs/code/electron-main/launch.ts‎

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

66
'use strict';
77

8-
import { IWindowsMainService, OpenContext } from 'vs/code/electron-main/windows';
8+
import { OpenContext } from 'vs/code/common/windows';
9+
import { IWindowsMainService } from 'vs/code/electron-main/windows';
910
import { VSCodeWindow } from 'vs/code/electron-main/window';
1011
import { TPromise } from 'vs/base/common/winjs.base';
1112
import { IChannel } from 'vs/base/parts/ipc/common/ipc';

‎src/vs/code/electron-main/main.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import * as platform from 'vs/base/common/platform';
1111
import { parseMainProcessArgv } from 'vs/platform/environment/node/argv';
1212
import { mkdirp } from 'vs/base/node/pfs';
1313
import { validatePaths } from 'vs/code/electron-main/paths';
14-
import { IWindowsMainService, WindowsManager, OpenContext } from 'vs/code/electron-main/windows';
14+
import { OpenContext } from 'vs/code/common/windows';
15+
import { IWindowsMainService, WindowsManager } from 'vs/code/electron-main/windows';
1516
import { IWindowsService } from 'vs/platform/windows/common/windows';
1617
import { WindowsChannel } from 'vs/platform/windows/common/windowsIpc';
1718
import { WindowsService } from 'vs/platform/windows/electron-main/windowsService';

‎src/vs/code/electron-main/menus.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import { isMacintosh, isLinux, isWindows, language } from 'vs/base/common/platfo
1010
import * as arrays from 'vs/base/common/arrays';
1111
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1212
import { ipcMain as ipc, app, shell, dialog, Menu, MenuItem } from 'electron';
13-
import { IWindowsMainService, OpenContext } from 'vs/code/electron-main/windows';
13+
import { OpenContext } from 'vs/code/common/windows';
14+
import { IWindowsMainService } from 'vs/code/electron-main/windows';
1415
import { VSCodeWindow } from 'vs/code/electron-main/window';
1516
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1617
import { IStorageService } from 'vs/code/electron-main/storage';

‎src/vs/code/electron-main/windows.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,16 @@ import { ILogService } from 'vs/code/electron-main/log';
2626
import { getPathLabel } from 'vs/base/common/labels';
2727
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2828
import { IWindowSettings } from 'vs/platform/windows/common/windows';
29-
import { getLastActiveWindow, OpenContext as OriginalOpenContext, findBestWindowOrFolder } from 'vs/code/node/windowsUtils';
29+
import { getLastActiveWindow, findBestWindowOrFolder } from 'vs/code/node/windowsUtils';
3030
import CommonEvent, { Emitter } from 'vs/base/common/event';
3131
import product from 'vs/platform/node/product';
32+
import { OpenContext } from 'vs/code/common/windows';
3233

3334
enum WindowError {
3435
UNRESPONSIVE,
3536
CRASHED
3637
}
3738

38-
export const OpenContext = OriginalOpenContext;
39-
export type OpenContext = OriginalOpenContext;
40-
4139
export interface IOpenConfiguration {
4240
context: OpenContext;
4341
cli: ParsedArgs;

‎src/vs/code/node/windowsUtils.ts‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,7 @@ import * as path from 'path';
99
import * as fs from 'original-fs';
1010
import * as platform from 'vs/base/common/platform';
1111
import * as paths from 'vs/base/common/paths';
12-
13-
export enum OpenContext {
14-
15-
// opening when running from the command line
16-
CLI,
17-
18-
// macOS only: opening from the dock (also when opening files to a running instance from desktop)
19-
DOCK,
20-
21-
// opening from the main application window
22-
MENU,
23-
24-
// opening from a file or folder dialog
25-
DIALOG,
26-
27-
// opening from the OS's UI
28-
DESKTOP,
29-
30-
// opening through the API
31-
API
32-
}
12+
import { OpenContext } from 'vs/code/common/windows';
3313

3414
/**
3515
* Exported subset of VSCodeWindow for testing.
@@ -42,8 +22,8 @@ export interface ISimpleWindow {
4222
/**
4323
* Exported for testing.
4424
*/
45-
export interface IBestWindowOrFolderOptions<WINDOW> {
46-
windows: WINDOW[];
25+
export interface IBestWindowOrFolderOptions<SimpleWindow extends ISimpleWindow> {
26+
windows: SimpleWindow[];
4727
newWindow: boolean;
4828
reuseWindow: boolean;
4929
context: OpenContext;
@@ -52,7 +32,7 @@ export interface IBestWindowOrFolderOptions<WINDOW> {
5232
vscodeFolder?: string;
5333
}
5434

55-
export function findBestWindowOrFolder<WINDOW extends ISimpleWindow>({ windows, newWindow, reuseWindow, context, filePath, userHome, vscodeFolder }: IBestWindowOrFolderOptions<WINDOW>): WINDOW | string {
35+
export function findBestWindowOrFolder<SimpleWindow extends ISimpleWindow>({ windows, newWindow, reuseWindow, context, filePath, userHome, vscodeFolder }: IBestWindowOrFolderOptions<SimpleWindow>): SimpleWindow | string {
5636
// OpenContext.DOCK implies newWindow unless overwritten by settings.
5737
const findBest = filePath && (context === OpenContext.DESKTOP || context === OpenContext.CLI || context === OpenContext.DOCK);
5838
const bestWindow = !newWindow && findBest && findBestWindow(windows, filePath);

‎src/vs/code/test/node/windowsUtils.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
import assert = require('assert');
88
import path = require('path');
9-
import { findBestWindowOrFolder, OpenContext, ISimpleWindow, IBestWindowOrFolderOptions } from 'vs/code/node/windowsUtils';
9+
import { findBestWindowOrFolder, ISimpleWindow, IBestWindowOrFolderOptions } from 'vs/code/node/windowsUtils';
10+
import { OpenContext } from 'vs/code/common/windows';
1011

1112
const fixturesFolder = require.toUrl('./fixtures');
1213

‎src/vs/platform/windows/electron-main/windowsService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import { fromEventEmitter } from 'vs/base/node/event';
1616
import { IURLService } from 'vs/platform/url/common/url';
1717

1818
// TODO@Joao: remove this dependency, move all implementation to this class
19-
import { IWindowsMainService, OpenContext } from 'vs/code/electron-main/windows';
19+
import { OpenContext } from 'vs/code/common/windows';
20+
import { IWindowsMainService } from 'vs/code/electron-main/windows';
2021

2122
export class WindowsService implements IWindowsService, IDisposable {
2223

0 commit comments

Comments
 (0)