Move toResource method to IWorkspaceFolder

This commit is contained in:
Sandeep Somavarapu
2017-09-20 15:06:43 +02:00
parent 04139fac35
commit 5fa7f9682a
21 changed files with 105 additions and 118 deletions

View File

@@ -47,7 +47,7 @@ import { ITreeItem } from 'vs/workbench/common/views';
import { ThemeColor } from 'vs/platform/theme/common/themeService';
import { IDisposable } from 'vs/base/common/lifecycle';
import { SerializedError } from 'vs/base/common/errors';
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { IWorkspaceFolderData } from 'vs/platform/workspace/common/workspace';
import { IStat, IFileChange } from 'vs/platform/files/common/files';
export interface IEnvironment {
@@ -65,7 +65,7 @@ export interface IEnvironment {
export interface IWorkspaceData {
id: string;
name: string;
folders: IWorkspaceFolder[];
folders: IWorkspaceFolderData[];
}
export interface IInitData {

View File

@@ -9,7 +9,7 @@ import Event, { Emitter } from 'vs/base/common/event';
import { normalize } from 'vs/base/common/paths';
import { delta } from 'vs/base/common/arrays';
import { relative } from 'path';
import { Workspace } from 'vs/platform/workspace/common/workspace';
import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { IWorkspaceData, ExtHostWorkspaceShape, MainContext, MainThreadWorkspaceShape, IMainContext } from './extHost.protocol';
import * as vscode from 'vscode';
import { compare } from 'vs/base/common/strings';
@@ -25,7 +25,7 @@ class Workspace2 extends Workspace {
private readonly _structure = new TrieMap<vscode.WorkspaceFolder>(s => s.split('/'));
private constructor(data: IWorkspaceData) {
super(data.id, data.name, data.folders);
super(data.id, data.name, data.folders.map(folder => new WorkspaceFolder(folder)));
// setup the workspace folder data structure
this.folders.forEach(({ name, uri, index }) => {