toWorkspaceFolders takes workspaceConfigPath

This commit is contained in:
Martin Aeschlimann
2019-04-16 16:01:30 +02:00
parent e5f694ebf8
commit 044c8ed8e1
7 changed files with 28 additions and 26 deletions

View File

@@ -10,7 +10,6 @@ import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
import { URI } from 'vs/base/common/uri';
import { getPathFromAmdModule } from 'vs/base/common/amd';
import { dirname } from 'vs/base/common/resources';
const fixturesFolder = getPathFromAmdModule(require, './fixtures');
@@ -19,7 +18,7 @@ const testWorkspace: IWorkspaceIdentifier = {
configPath: URI.file(path.join(fixturesFolder, 'workspaces.json'))
};
const testWorkspaceFolders = toWorkspaceFolders([{ path: path.join(fixturesFolder, 'vscode_workspace_1_folder') }, { path: path.join(fixturesFolder, 'vscode_workspace_2_folder') }], dirname(testWorkspace.configPath));
const testWorkspaceFolders = toWorkspaceFolders([{ path: path.join(fixturesFolder, 'vscode_workspace_1_folder') }, { path: path.join(fixturesFolder, 'vscode_workspace_2_folder') }], testWorkspace.configPath);
function options(custom?: Partial<IBestWindowOrFolderOptions<ISimpleWindow>>): IBestWindowOrFolderOptions<ISimpleWindow> {
return {