files 💄

This commit is contained in:
Benjamin Pasero
2017-03-17 07:59:43 +01:00
parent 8d09c1a286
commit 05f19eec20
16 changed files with 139 additions and 43 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ 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/code/common/windows';
import { isParent, isEqual } from 'vs/platform/files/common/files';
import { isEqualOrParent } from 'vs/platform/files/common/files';
/**
* Exported subset of VSCodeWindow for testing.
@@ -47,7 +47,7 @@ export function findBestWindowOrFolder<SimpleWindow extends ISimpleWindow>({ win
}
function findBestWindow<WINDOW extends ISimpleWindow>(windows: WINDOW[], filePath: string): WINDOW {
const containers = windows.filter(window => typeof window.openedWorkspacePath === 'string' && (isEqual(filePath, window.openedWorkspacePath) || isParent(filePath, window.openedWorkspacePath)));
const containers = windows.filter(window => typeof window.openedWorkspacePath === 'string' && isEqualOrParent(filePath, window.openedWorkspacePath));
if (containers.length) {
return containers.sort((a, b) => -(a.openedWorkspacePath.length - b.openedWorkspacePath.length))[0];
}