Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-25 15:35:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

more 💄 around window finder helper

Browse Source
This commit is contained in:
Benjamin Pasero
2017-07-10 10:20:48 +02:00
parent f4ae12b20d
commit f894bb9856
4 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/electron-main/windows.ts
+10 -52
View File
@@ -21,11 +21,11 @@ import { ILifecycleService, UnloadReason } from 'vs/platform/lifecycle/electron-
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ILogService } from 'vs/platform/log/common/log';
import { IWindowSettings, OpenContext, IPath, IWindowConfiguration } from 'vs/platform/windows/common/windows';
import { getLastActiveWindow, findBestWindowOrFolderForFile } from 'vs/code/node/windowsFinder';
import { getLastActiveWindow, findBestWindowOrFolderForFile, findWindowOnWorkspace } from 'vs/code/node/windowsFinder';
import CommonEvent, { Emitter } from 'vs/base/common/event';
import product from 'vs/platform/node/product';
import { ITelemetryService, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
import { isEqual, isEqualOrParent } from 'vs/base/common/paths';
import { isEqual } from 'vs/base/common/paths';
import { IWindowsMainService, IOpenConfiguration } from "vs/platform/windows/electron-main/windows";
import { IHistoryMainService } from "vs/platform/history/electron-main/historyMainService";
import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
@@ -356,22 +356,25 @@ export class WindowsManager implements IWindowsMainService {
// We found a suitable window to open the files within
if (bestWindowOrFolder instanceof CodeWindow) {
bestWindowOrFolder.focus();
const files = { filesToOpen, filesToCreate, filesToDiff }; // copy to object because they get reset shortly after
bestWindowOrFolder.ready().then(readyWindow => {
const windowToUse = bestWindowOrFolder;
windowToUse.focus();
windowToUse.ready().then(readyWindow => {
readyWindow.send('vscode:openFiles', files);
});
usedWindows.push(bestWindowOrFolder);
usedWindows.push(windowToUse);
}
// Otherwise open a new window with the best folder to use for the file
else {
const folderToOpen = bestWindowOrFolder;
const browserWindow = this.openInBrowserWindow({
userEnv: openConfig.userEnv,
cli: openConfig.cli,
initialStartup: openConfig.initialStartup,
workspacePath: bestWindowOrFolder,
workspacePath: folderToOpen,
filesToOpen,
filesToCreate,
filesToDiff,
@@ -393,7 +396,7 @@ export class WindowsManager implements IWindowsMainService {
if (allFoldersToOpen.length > 0) {
// Check for existing instances
const windowsOnWorkspacePath = arrays.coalesce(allFoldersToOpen.map(folderToOpen => this.findWindow(folderToOpen)));
const windowsOnWorkspacePath = arrays.coalesce(allFoldersToOpen.map(folderToOpen => findWindowOnWorkspace(WindowsManager.WINDOWS, folderToOpen)));
if (windowsOnWorkspacePath.length > 0) {
const browserWindow = windowsOnWorkspacePath[0];
browserWindow.focus(); // just focus one of them
@@ -1003,51 +1006,6 @@ export class WindowsManager implements IWindowsMainService {
return getLastActiveWindow(WindowsManager.WINDOWS);
}
public findWindow(workspacePath: string, filePath?: string, extensionDevelopmentPath?: string): CodeWindow {
if (WindowsManager.WINDOWS.length) {
// Sort the last active window to the front of the array of windows to test
const windowsToTest = WindowsManager.WINDOWS.slice(0);
const lastActiveWindow = this.getLastActiveWindow();
if (lastActiveWindow) {
windowsToTest.splice(windowsToTest.indexOf(lastActiveWindow), 1);
windowsToTest.unshift(lastActiveWindow);
}
// Find it
const res = windowsToTest.filter(w => {
// match on workspace
if (typeof w.openedWorkspacePath === 'string' && (isEqual(w.openedWorkspacePath, workspacePath, !isLinux /* ignorecase */))) {
return true;
}
// match on file
if (typeof w.openedFilePath === 'string' && isEqual(w.openedFilePath, filePath, !isLinux /* ignorecase */)) {
return true;
}
// match on file path
if (typeof w.openedWorkspacePath === 'string' && filePath && isEqualOrParent(filePath, w.openedWorkspacePath, !isLinux /* ignorecase */)) {
return true;
}
// match on extension development path
if (typeof extensionDevelopmentPath === 'string' && isEqual(w.extensionDevelopmentPath, extensionDevelopmentPath, !isLinux /* ignorecase */)) {
return true;
}
return false;
});
if (res && res.length) {
return res[0];
}
}
return null;
}
public openNewWindow(context: OpenContext): void {
this.open({ context, cli: this.environmentService.args, forceNewWindow: true, forceEmpty: true });
}
src/vs/code/node/windowsFinder.ts
+52 -6
View File
@@ -11,17 +11,13 @@ import * as platform from 'vs/base/common/platform';
import * as paths from 'vs/base/common/paths';
import { OpenContext } from 'vs/platform/windows/common/windows';
/**
* Exported subset of CodeWindow for testing.
*/
export interface ISimpleWindow {
openedWorkspacePath: string;
openedFilePath?: string;
extensionDevelopmentPath?: string;
lastFocusTime: number;
}
/**
* Exported for testing.
*/
export interface IBestWindowOrFolderOptions<W extends ISimpleWindow> {
windows: W[];
newWindow: boolean;
@@ -108,3 +104,53 @@ export function getLastActiveWindow<W extends ISimpleWindow>(windows: W[]): W {
return null;
}
export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspacePath: string): W {
if (windows.length) {
// Sort the last active window to the front of the array of windows to test
const windowsToTest = windows.slice(0);
const lastActiveWindow = getLastActiveWindow(windows);
if (lastActiveWindow) {
windowsToTest.splice(windowsToTest.indexOf(lastActiveWindow), 1);
windowsToTest.unshift(lastActiveWindow);
}
// Find it
const res = windowsToTest.filter(w => {
// match on workspace
if (typeof w.openedWorkspacePath === 'string' && (paths.isEqual(w.openedWorkspacePath, workspacePath, !platform.isLinux /* ignorecase */))) {
return true;
}
return false;
});
if (res && res.length) {
return res[0];
}
}
return null;
}
export function findExtensionDevelopmentWindow<W extends ISimpleWindow>(windows: W[], extensionDevelopmentPath?: string): W {
if (windows.length) {
const res = windows.filter(w => {
// match on extension development path
if (typeof extensionDevelopmentPath === 'string' && paths.isEqual(w.extensionDevelopmentPath, extensionDevelopmentPath, !platform.isLinux /* ignorecase */)) {
return true;
}
return false;
});
if (res && res.length) {
return res[0];
}
}
return null;
}
src/vs/platform/windows/electron-main/windows.ts
+1 -1
View File
@@ -18,6 +18,7 @@ export interface ICodeWindow {
win: Electron.BrowserWindow;
config: IWindowConfiguration;
openedWorkspacePath: string;
lastFocusTime: number;
readyState: ReadyState;
@@ -56,7 +57,6 @@ export interface IWindowsMainService {
focusLastActive(cli: ParsedArgs, context: OpenContext): ICodeWindow;
getLastActiveWindow(): ICodeWindow;
waitForWindowClose(windowId: number): TPromise<void>;
findWindow(workspacePath: string, filePath?: string, extensionDevelopmentPath?: string): ICodeWindow;
openNewWindow(context: OpenContext): void;
sendToFocused(channel: string, ...args: any[]): void;
sendToAll(channel: string, payload: any, windowIdsToIgnore?: number[]): void;
src/vs/platform/windows/electron-main/windowsService.ts
+4 -3
View File
@@ -19,6 +19,7 @@ import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
import { ILifecycleService } from "vs/platform/lifecycle/electron-main/lifecycleMain";
import { IWindowsMainService, ISharedProcess } from "vs/platform/windows/electron-main/windows";
import { IHistoryMainService } from "vs/platform/history/electron-main/historyMainService";
import { findExtensionDevelopmentWindow } from "vs/code/node/windowsFinder";
export class WindowsService implements IWindowsService, IDisposable {
@@ -287,9 +288,9 @@ export class WindowsService implements IWindowsService, IDisposable {
}
closeExtensionHostWindow(extensionDevelopmentPaths: string[]): TPromise<void> {
extensionDevelopmentPaths.map(p => this.windowsMainService.findWindow(null, null, p)).forEach(windowOnExtension => {
if (windowOnExtension) {
windowOnExtension.win.close();
extensionDevelopmentPaths.map(extensionDevelopmentPath => findExtensionDevelopmentWindow(this.windowsMainService.getWindows(), extensionDevelopmentPath)).forEach(extensionDevelopmentWindow => {
if (extensionDevelopmentWindow) {
extensionDevelopmentWindow.win.close();
}
});