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

adopt IWorkspace2, implement proper workspaceContains, #28526

Browse Source
This commit is contained in:
Johannes Rieken
2017-06-14 12:21:16 +02:00
parent cae242f714
commit f8eb2fa3b8
9 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ import { IThreadService } from 'vs/workbench/services/thread/common/threadServic
import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
import { fromRange, EndOfLine } from 'vs/workbench/api/node/extHostTypeConverters';
import { ExtHostWorkspaceShape, MainContext, MainThreadWorkspaceShape } from './extHost.protocol';
import { IWorkspaceData, ExtHostWorkspaceShape, MainContext, MainThreadWorkspaceShape } from './extHost.protocol';
import * as vscode from 'vscode';
export class ExtHostWorkspace extends ExtHostWorkspaceShape {
@@ -20,18 +20,19 @@ export class ExtHostWorkspace extends ExtHostWorkspaceShape {
private static _requestIdPool = 0;
private readonly _proxy: MainThreadWorkspaceShape;
private _workspaceFolders: URI[];
private _workspace: IWorkspaceData;
constructor(threadService: IThreadService, folders: URI[]) {
constructor(threadService: IThreadService, workspace: IWorkspaceData) {
super();
this._proxy = threadService.get(MainContext.MainThreadWorkspace);
this._workspaceFolders = folders;
this._workspace = workspace;
}
// --- workspace ---
getPath(): string {
return isFalsyOrEmpty(this._workspaceFolders) ? undefined : this._workspaceFolders[0].fsPath;
// TODO@Joh handle roots.length > 1 case
return this._workspace ? this._workspace.roots[0].fsPath : undefined;
}
getRelativePath(pathOrUri: string | vscode.Uri): string {
@@ -47,11 +48,11 @@ export class ExtHostWorkspace extends ExtHostWorkspaceShape {
return path;
}
if (isFalsyOrEmpty(this._workspaceFolders)) {
if (!this._workspace || isFalsyOrEmpty(this._workspace.roots)) {
return normalize(path);
}
for (const { fsPath } of this._workspaceFolders) {
for (const { fsPath } of this._workspace.roots) {
let result = relative(fsPath, path);
if (!result || result.indexOf('..') === 0) {
continue;
@@ -62,9 +63,9 @@ export class ExtHostWorkspace extends ExtHostWorkspaceShape {
return normalize(path);
}
$acceptWorkspaceData(workspaceFolders: URI[]): void {
$acceptWorkspaceData(workspace: IWorkspaceData): void {
//TODO@joh equality-check, emit event etc.
this._workspaceFolders = workspaceFolders;
this._workspace = workspace;
}
// --- search ---