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

Rename roots to folders

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-09-14 10:26:39 +02:00
parent 8625945db5
commit 2153617a7c
55 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -64,7 +64,7 @@ export interface IEnvironment {
export interface IWorkspaceData {
id: string;
name: string;
roots: URI[];
folders: URI[];
}
export interface IInitData {

20
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -32,10 +32,10 @@ class Workspace2 extends Workspace {
private readonly _structure = new TrieMap<vscode.WorkspaceFolder>(s => s.split('/'));
private constructor(data: IWorkspaceData) {
super(data.id, data.name, data.roots);
super(data.id, data.name, data.folders);
// setup the workspace folder data structure
this.roots.forEach((uri, index) => {
this.folders.forEach((uri, index) => {
const folder = {
name: basename(uri.fsPath),
uri,
@@ -46,7 +46,7 @@ class Workspace2 extends Workspace {
});
}
get folders(): vscode.WorkspaceFolder[] {
get workspaceFolders(): vscode.WorkspaceFolder[] {
return this._folder.slice(0);
}
@@ -92,7 +92,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
if (!this._workspace) {
return undefined;
} else {
return this._workspace.folders.slice(0);
return this._workspace.workspaceFolders.slice(0);
}
}
@@ -110,11 +110,11 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
if (!this._workspace) {
return undefined;
}
const { roots } = this._workspace;
if (roots.length === 0) {
const { folders } = this._workspace;
if (folders.length === 0) {
return undefined;
}
return roots[0].fsPath;
return folders[0].fsPath;
}
getRelativePath(pathOrUri: string | vscode.Uri, includeWorkspace?: boolean): string {
@@ -140,7 +140,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
}
if (typeof includeWorkspace === 'undefined') {
includeWorkspace = this.workspace.roots.length > 1;
includeWorkspace = this.workspace.folders.length > 1;
}
let result = relative(folder.uri.fsPath, path);
@@ -155,10 +155,10 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
// keep old workspace folder, build new workspace, and
// capture new workspace folders. Compute delta between
// them send that as event
const oldRoots = this._workspace ? this._workspace.folders.sort(ExtHostWorkspace._compareWorkspaceFolder) : [];
const oldRoots = this._workspace ? this._workspace.workspaceFolders.sort(ExtHostWorkspace._compareWorkspaceFolder) : [];
this._workspace = Workspace2.fromData(data);
const newRoots = this._workspace ? this._workspace.folders.sort(ExtHostWorkspace._compareWorkspaceFolder) : [];
const newRoots = this._workspace ? this._workspace.workspaceFolders.sort(ExtHostWorkspace._compareWorkspaceFolder) : [];
const { added, removed } = delta(oldRoots, newRoots, ExtHostWorkspace._compareWorkspaceFolder);
this._onDidChangeWorkspace.fire(Object.freeze({