diff --git a/src/vs/base/common/paths.ts b/src/vs/base/common/paths.ts index c96193ba433696fad54b99b7b81a5a6cf5dbbbef..3ad625b365305bd1978ef91e5462c131bbfa3b5d 100644 --- a/src/vs/base/common/paths.ts +++ b/src/vs/base/common/paths.ts @@ -311,14 +311,6 @@ export function isUNC(path: string): boolean { return true; } -function isPosixAbsolute(path: string): boolean { - return path && path[0] === '/'; -} - -export function makePosixAbsolute(path: string): string { - return isPosixAbsolute(normalize(path)) ? path : sep + path; -} - // Reference: https://en.wikipedia.org/wiki/Filename const INVALID_FILE_CHARS = isWindows ? /[\\/:\*\?"<>\|]/g : /[\\/]/g; const WINDOWS_FORBIDDEN_NAMES = /^(con|prn|aux|clock\$|nul|lpt[0-9]|com[0-9])$/i; diff --git a/src/vs/base/test/common/paths.test.ts b/src/vs/base/test/common/paths.test.ts index 26ec076adfcd47d946d3806a8ace3c6181550eed..230bfb306ed87866c07744eb424b9f99b02ed35b 100644 --- a/src/vs/base/test/common/paths.test.ts +++ b/src/vs/base/test/common/paths.test.ts @@ -117,15 +117,6 @@ suite('Paths', () => { }); - test('makeAbsolute', () => { - assert.equal(paths.makePosixAbsolute('foo'), '/foo'); - assert.equal(paths.makePosixAbsolute('foo/bar'), '/foo/bar'); - assert.equal(paths.makePosixAbsolute('foo/bar/'), '/foo/bar/'); - assert.equal(paths.makePosixAbsolute('/foo/bar'), '/foo/bar'); - assert.equal(paths.makePosixAbsolute('/'), '/'); - assert.equal(paths.makePosixAbsolute(''), '/'); - }); - test('basename', () => { assert.equal(paths.basename('foo/bar'), 'bar'); assert.equal(paths.basename('foo\\bar'), 'bar'); diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 2b279afb06e16241dd79023bff358aa1ccbc7407..64a34c6c566febed9c82b79b693e67276068ab73 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -100,7 +100,7 @@ export class TestContextService implements IWorkspaceContextService { } public toWorkspaceRelativePath(resource: URI, toOSPath?: boolean): string { - return paths.makePosixAbsolute(paths.normalize(resource.fsPath.substr('c:'.length), toOSPath)); + return makePosixAbsolute(paths.normalize(resource.fsPath.substr('c:'.length), toOSPath)); } public toResource(workspaceRelativePath: string): URI { @@ -108,6 +108,14 @@ export class TestContextService implements IWorkspaceContextService { } } +function isPosixAbsolute(path: string): boolean { + return path && path[0] === '/'; +} + +function makePosixAbsolute(path: string): string { + return isPosixAbsolute(paths.normalize(path)) ? path : paths.sep + path; +} + export class TestTextFileService extends TextFileService { public cleanupBackupsBeforeShutdownCalled: boolean;