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

Use resources instead of paths for dirname, basename, joinPath, normalizePath, isAbsolutePath

Browse Source
This commit is contained in:
Martin Aeschlimann
2018-08-08 16:06:16 +02:00
parent 60ef4f5d82
commit 62c5e45b18
18 changed files with 177 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,13 +4,13 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { posix, relative, join } from 'path';
import { relative, join } from 'path';
import { delta as arrayDelta } from 'vs/base/common/arrays';
import { Emitter, Event } from 'vs/base/common/event';
import { TernarySearchTree } from 'vs/base/common/map';
import { normalize } from 'vs/base/common/paths';
import { isLinux } from 'vs/base/common/platform';
import { basenameOrAuthority, isEqual } from 'vs/base/common/resources';
import { basenameOrAuthority, isEqual, dirname } from 'vs/base/common/resources';
import { compare } from 'vs/base/common/strings';
import URI from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -124,7 +124,7 @@ class ExtHostWorkspaceImpl extends Workspace {
getWorkspaceFolder(uri: URI, resolveParent?: boolean): vscode.WorkspaceFolder {
if (resolveParent && this._structure.get(uri.toString())) {
// `uri` is a workspace folder so we check for its parent
uri = uri.with({ path: posix.dirname(uri.path) });
uri = dirname(uri);
}
return this._structure.findSubstr(uri.toString());
}