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

use native path#{join,normalize} over our custom stuff

Browse Source
This commit is contained in:
Johannes Rieken
2017-03-24 15:10:55 +01:00
parent d434d75517
commit 0e5198437c
10 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/node/extHostExtensionService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import * as paths from 'vs/base/common/paths';
import { join } from 'path';
import { mkdirp, dirExists } from 'vs/base/node/pfs';
import Severity from 'vs/base/common/severity';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -121,7 +121,7 @@ class ExtensionStoragePath {
value(extension: IExtensionDescription): string {
if (this._value) {
return paths.join(this._value, extension.id);
return join(this._value, extension.id);
}
return undefined;
}
@@ -139,7 +139,7 @@ class ExtensionStoragePath {
.update(workspace.uid ? workspace.uid.toString() : '')
.digest('hex');
const storagePath = paths.join(this._environment.appSettingsHome, 'workspaceStorage', storageName);
const storagePath = join(this._environment.appSettingsHome, 'workspaceStorage', storageName);
return dirExists(storagePath).then(exists => {
if (exists) {
@@ -276,7 +276,7 @@ export class ExtHostExtensionService extends AbstractExtensionService<ExtHostExt
subscriptions: [],
get extensionPath() { return extensionDescription.extensionFolderPath; },
storagePath: this._storagePath.value(extensionDescription),
asAbsolutePath: (relativePath: string) => { return paths.normalize(paths.join(extensionDescription.extensionFolderPath, relativePath), true); }
asAbsolutePath: (relativePath: string) => { return join(extensionDescription.extensionFolderPath, relativePath); }
});
});
}