Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-05 00:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

make window finder fit for workspaces

Browse Source
This commit is contained in:
Benjamin Pasero
2017-07-18 12:02:36 +02:00
parent 87dd24653e
commit c30266c690
3 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/code/test/node/windowsFinder.test.ts
View File

@@ -8,9 +8,15 @@ import assert = require('assert');
import path = require('path');
import { findBestWindowOrFolderForFile, ISimpleWindow, IBestWindowOrFolderOptions } from 'vs/code/node/windowsFinder';
import { OpenContext } from 'vs/platform/windows/common/windows';
import { IWorkspaceIdentifier } from "vs/platform/workspaces/common/workspaces";
const fixturesFolder = require.toUrl('./fixtures');
const testWorkspace: IWorkspaceIdentifier = {
id: Date.now().toString(),
configPath: path.join(fixturesFolder, 'workspaces.json')
};
function options(custom?: Partial<IBestWindowOrFolderOptions<ISimpleWindow>>): IBestWindowOrFolderOptions<ISimpleWindow> {
return {
windows: [],
@@ -18,6 +24,7 @@ function options(custom?: Partial<IBestWindowOrFolderOptions<ISimpleWindow>>): I
reuseWindow: false,
context: OpenContext.CLI,
codeSettingsFolder: '_vscode',
workspaceResolver: workspace => { return workspace === testWorkspace ? { id: testWorkspace.id, folders: [path.join(fixturesFolder, 'vscode_workspace_1_folder'), path.join(fixturesFolder, 'vscode_workspace_2_folder')] } : null; },
...custom
};
}
@@ -152,4 +159,12 @@ suite('WindowsFinder', () => {
userHome: path.join(fixturesFolder, 'vscode_home_folder')
})), path.join(fixturesFolder, 'vscode_home_folder'));
});
test('Workspace folder wins', () => {
const window = { lastFocusTime: 1, openedWorkspace: testWorkspace };
assert.equal(findBestWindowOrFolderForFile(options({
windows: [window],
filePath: path.join(fixturesFolder, 'vscode_workspace_2_folder', 'nested_vscode_folder', 'subfolder', 'file.txt')
})), window);
});
});