From a99b64ae8eac70a5ddcbeacaf207ce32bbfdd8ff Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 13 Feb 2019 11:25:06 +0100 Subject: [PATCH] paths - avoid posix usages --- .../platform/extensionManagement/node/extensionLifecycle.ts | 6 +++--- src/vs/platform/localizations/node/localizations.ts | 6 +++--- src/vs/workbench/api/node/apiCommands.ts | 4 ++-- src/vs/workbench/api/node/extHostOutputService.ts | 6 +++--- .../configurationResolver/common/variableResolver.ts | 2 +- .../extensions/electron-browser/extensionService.ts | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts index 2b55aa25e5f..57b5112f8f4 100644 --- a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts +++ b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts @@ -8,7 +8,7 @@ import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensio import { ILogService } from 'vs/platform/log/common/log'; import { fork, ChildProcess } from 'child_process'; import { toErrorMessage } from 'vs/base/common/errorMessage'; -import { posix } from 'vs/base/common/path'; +import { join } from 'vs/base/common/path'; import { Limiter } from 'vs/base/common/async'; import { Event } from 'vs/base/common/event'; import { Schemas } from 'vs/base/common/network'; @@ -45,7 +45,7 @@ export class ExtensionsLifecycle extends Disposable { this.logService.warn(extension.identifier.id, extension.manifest.version, `${scriptKey} should be a node script`); return null; } - return { script: posix.join(extension.location.fsPath, script[1]), args: script.slice(2) || [] }; + return { script: join(extension.location.fsPath, script[1]), args: script.slice(2) || [] }; } return null; } @@ -130,6 +130,6 @@ export class ExtensionsLifecycle extends Disposable { } private getExtensionStoragePath(extension: ILocalExtension): string { - return posix.join(this.environmentService.globalStorageHome, extension.identifier.id.toLowerCase()); + return join(this.environmentService.globalStorageHome, extension.identifier.id.toLowerCase()); } } diff --git a/src/vs/platform/localizations/node/localizations.ts b/src/vs/platform/localizations/node/localizations.ts index a0740ffa1a1..1deb73c4cab 100644 --- a/src/vs/platform/localizations/node/localizations.ts +++ b/src/vs/platform/localizations/node/localizations.ts @@ -16,7 +16,7 @@ import product from 'vs/platform/node/product'; import { distinct, equals } from 'vs/base/common/arrays'; import { Event, Emitter } from 'vs/base/common/event'; import { Schemas } from 'vs/base/common/network'; -import { posix } from 'vs/base/common/path'; +import { join } from 'vs/base/common/path'; interface ILanguagePack { hash: string; @@ -105,7 +105,7 @@ class LanguagePacksCache extends Disposable { @ILogService private readonly logService: ILogService ) { super(); - this.languagePacksFilePath = posix.join(environmentService.userDataPath, 'languagepacks.json'); + this.languagePacksFilePath = join(environmentService.userDataPath, 'languagepacks.json'); this.languagePacksFileLimiter = new Queue(); } @@ -151,7 +151,7 @@ class LanguagePacksCache extends Disposable { languagePack.extensions.push({ extensionIdentifier, version: extension.manifest.version }); } for (const translation of localizationContribution.translations) { - languagePack.translations[translation.id] = posix.join(extension.location.fsPath, translation.path); + languagePack.translations[translation.id] = join(extension.location.fsPath, translation.path); } } } diff --git a/src/vs/workbench/api/node/apiCommands.ts b/src/vs/workbench/api/node/apiCommands.ts index ab545da263a..ae2ee5b4c0e 100644 --- a/src/vs/workbench/api/node/apiCommands.ts +++ b/src/vs/workbench/api/node/apiCommands.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { tmpdir } from 'os'; -import { posix } from 'vs/base/common/path'; +import { join } from 'vs/base/common/path'; import * as vscode from 'vscode'; import { URI } from 'vs/base/common/uri'; import { isMalformedFileUri } from 'vs/base/common/resources'; @@ -130,7 +130,7 @@ CommandsRegistry.registerCommand(SetEditorLayoutAPICommand.ID, adjustHandler(Set CommandsRegistry.registerCommand('_workbench.downloadResource', function (accessor: ServicesAccessor, resource: URI) { const downloadService = accessor.get(IDownloadService); - const location = posix.join(tmpdir(), generateUuid()); + const location = join(tmpdir(), generateUuid()); return downloadService.download(resource, location).then(() => URI.file(location)); }); \ No newline at end of file diff --git a/src/vs/workbench/api/node/extHostOutputService.ts b/src/vs/workbench/api/node/extHostOutputService.ts index 378e541f990..e009ffb6dcb 100644 --- a/src/vs/workbench/api/node/extHostOutputService.ts +++ b/src/vs/workbench/api/node/extHostOutputService.ts @@ -6,7 +6,7 @@ import { MainContext, MainThreadOutputServiceShape, IMainContext, ExtHostOutputServiceShape } from './extHost.protocol'; import * as vscode from 'vscode'; import { URI } from 'vs/base/common/uri'; -import { posix } from 'vs/base/common/path'; +import { join } from 'vs/base/common/path'; import { OutputAppender } from 'vs/workbench/contrib/output/node/outputAppender'; import { toLocalISOString } from 'vs/base/common/date'; import { Event, Emitter } from 'vs/base/common/event'; @@ -103,7 +103,7 @@ export class ExtHostOutputChannelBackedByFile extends AbstractExtHostOutputChann constructor(name: string, outputDir: string, proxy: MainThreadOutputServiceShape) { const fileName = `${ExtHostOutputChannelBackedByFile._namePool++}-${name}`; - const file = URI.file(posix.join(outputDir, `${fileName}.log`)); + const file = URI.file(join(outputDir, `${fileName}.log`)); super(name, false, file, proxy); this._appender = new OutputAppender(fileName, file.fsPath); @@ -150,7 +150,7 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape { private _visibleChannelDisposable: IDisposable; constructor(logsLocation: URI, mainContext: IMainContext) { - this._outputDir = posix.join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`); + this._outputDir = join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`); this._proxy = mainContext.getProxy(MainContext.MainThreadOutputService); } diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts index 544988b7489..e23d271a4e7 100644 --- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts @@ -236,7 +236,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe case 'relativeFile': if (folderUri) { - return resolvedValue = paths.posix.normalize(paths.relative(folderUri.fsPath, filePath)); + return resolvedValue = paths.normalize(paths.relative(folderUri.fsPath, filePath)); } return resolvedValue = filePath; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index a6d06e2e448..d7d69bb07c9 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -101,7 +101,7 @@ export class ExtensionService extends Disposable implements IExtensionService { @ILifecycleService private readonly _lifecycleService: ILifecycleService ) { super(); - this._extensionHostLogsLocation = URI.file(path.posix.join(this._environmentService.logsPath, `exthost${this._windowService.getCurrentWindowId()}`)); + this._extensionHostLogsLocation = URI.file(path.join(this._environmentService.logsPath, `exthost${this._windowService.getCurrentWindowId()}`)); this._registry = null; this._installedExtensionsReady = new Barrier(); this._isDev = !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment; -- GitLab