diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts index 03c9ae5ab89..425a2329a6a 100644 --- a/src/vs/workbench/api/node/extHostLogService.ts +++ b/src/vs/workbench/api/node/extHostLogService.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { joinWithSlashes } from 'vs/base/common/extpath'; import { join } from 'vs/base/common/path'; import { ILogService, DelegatedLogService, LogLevel } from 'vs/platform/log/common/log'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; @@ -31,6 +30,6 @@ export class ExtHostLogService extends DelegatedLogService implements ILogServic } getLogDirectory(extensionID: ExtensionIdentifier): string { - return joinWithSlashes(this._logsPath, extensionID.value); + return join(this._logsPath, extensionID.value); } } diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts index ebe428d0523..47c177df136 100644 --- a/src/vs/workbench/services/configuration/node/configuration.ts +++ b/src/vs/workbench/services/configuration/node/configuration.ts @@ -5,7 +5,6 @@ import { URI } from 'vs/base/common/uri'; import { createHash } from 'crypto'; -import * as extpath from 'vs/base/common/extpath'; import * as resources from 'vs/base/common/resources'; import { Event, Emitter } from 'vs/base/common/event'; import * as pfs from 'vs/base/node/pfs'; @@ -308,7 +307,7 @@ class CachedWorkspaceConfiguration extends Disposable implements IWorkspaceConfi private createPaths(workspaceIdentifier: IWorkspaceIdentifier) { this.cachedWorkspacePath = join(this.environmentService.userDataPath, 'CachedConfigurations', 'workspaces', workspaceIdentifier.id); - this.cachedConfigurationPath = extpath.joinWithSlashes(this.cachedWorkspacePath, 'workspace.json'); + this.cachedConfigurationPath = join(this.cachedWorkspacePath, 'workspace.json'); } } @@ -552,7 +551,7 @@ export class CachedFolderConfiguration extends Disposable implements IFolderConf configFolderRelativePath: string, environmentService: IEnvironmentService) { super(); - this.cachedFolderPath = extpath.joinWithSlashes(environmentService.userDataPath, 'CachedConfigurations', 'folders', createHash('md5').update(extpath.joinWithSlashes(folder.path, configFolderRelativePath)).digest('hex')); + this.cachedFolderPath = join(environmentService.userDataPath, 'CachedConfigurations', 'folders', createHash('md5').update(join(folder.path, configFolderRelativePath)).digest('hex')); this.cachedConfigurationPath = join(this.cachedFolderPath, 'configuration.json'); this.configurationModel = new ConfigurationModel(); }