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

prefer workspace object over workspace config path

Browse Source
This commit is contained in:
Benjamin Pasero
2017-07-12 08:48:20 +02:00
parent c890422b05
commit 7a35ef4b00
13 changed files with 240 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/node/windowsFinder.ts
+4 -3
View File
@@ -10,9 +10,10 @@ import * as fs from 'fs';
import * as platform from 'vs/base/common/platform';
import * as paths from 'vs/base/common/paths';
import { OpenContext } from 'vs/platform/windows/common/windows';
import { IWorkspace } from "vs/platform/workspaces/common/workspaces";
export interface ISimpleWindow {
openedWorkspaceConfigPath?: string;
openedWorkspace?: IWorkspace;
openedFolderPath?: string;
openedFilePath?: string;
extensionDevelopmentPath?: string;
@@ -126,12 +127,12 @@ export function findWindowOnFolder<W extends ISimpleWindow>(windows: W[], folder
return null;
}
export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspaceConfigPath: string): W {
export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspace: IWorkspace): W {
if (windows.length) {
const res = windows.filter(w => {
// match on workspace
if (typeof w.openedWorkspaceConfigPath === 'string' && (paths.isEqual(w.openedWorkspaceConfigPath, workspaceConfigPath, !platform.isLinux /* ignorecase */))) {
if (w.openedWorkspace && w.openedWorkspace.id === workspace.id) {
return true;
}