Skip to content

Commit a99b64a

Browse files
author
Benjamin Pasero
committed
paths - avoid posix usages
1 parent 5038a82 commit a99b64a

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/vs/platform/extensionManagement/node/extensionLifecycle.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensio
88
import { ILogService } from 'vs/platform/log/common/log';
99
import { fork, ChildProcess } from 'child_process';
1010
import { toErrorMessage } from 'vs/base/common/errorMessage';
11-
import { posix } from 'vs/base/common/path';
11+
import { join } from 'vs/base/common/path';
1212
import { Limiter } from 'vs/base/common/async';
1313
import { Event } from 'vs/base/common/event';
1414
import { Schemas } from 'vs/base/common/network';
@@ -45,7 +45,7 @@ export class ExtensionsLifecycle extends Disposable {
4545
this.logService.warn(extension.identifier.id, extension.manifest.version, `${scriptKey} should be a node script`);
4646
return null;
4747
}
48-
return { script: posix.join(extension.location.fsPath, script[1]), args: script.slice(2) || [] };
48+
return { script: join(extension.location.fsPath, script[1]), args: script.slice(2) || [] };
4949
}
5050
return null;
5151
}
@@ -130,6 +130,6 @@ export class ExtensionsLifecycle extends Disposable {
130130
}
131131

132132
private getExtensionStoragePath(extension: ILocalExtension): string {
133-
return posix.join(this.environmentService.globalStorageHome, extension.identifier.id.toLowerCase());
133+
return join(this.environmentService.globalStorageHome, extension.identifier.id.toLowerCase());
134134
}
135135
}

‎src/vs/platform/localizations/node/localizations.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import product from 'vs/platform/node/product';
1616
import { distinct, equals } from 'vs/base/common/arrays';
1717
import { Event, Emitter } from 'vs/base/common/event';
1818
import { Schemas } from 'vs/base/common/network';
19-
import { posix } from 'vs/base/common/path';
19+
import { join } from 'vs/base/common/path';
2020

2121
interface ILanguagePack {
2222
hash: string;
@@ -105,7 +105,7 @@ class LanguagePacksCache extends Disposable {
105105
@ILogService private readonly logService: ILogService
106106
) {
107107
super();
108-
this.languagePacksFilePath = posix.join(environmentService.userDataPath, 'languagepacks.json');
108+
this.languagePacksFilePath = join(environmentService.userDataPath, 'languagepacks.json');
109109
this.languagePacksFileLimiter = new Queue();
110110
}
111111

@@ -151,7 +151,7 @@ class LanguagePacksCache extends Disposable {
151151
languagePack.extensions.push({ extensionIdentifier, version: extension.manifest.version });
152152
}
153153
for (const translation of localizationContribution.translations) {
154-
languagePack.translations[translation.id] = posix.join(extension.location.fsPath, translation.path);
154+
languagePack.translations[translation.id] = join(extension.location.fsPath, translation.path);
155155
}
156156
}
157157
}

‎src/vs/workbench/api/node/apiCommands.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { tmpdir } from 'os';
7-
import { posix } from 'vs/base/common/path';
7+
import { join } from 'vs/base/common/path';
88
import * as vscode from 'vscode';
99
import { URI } from 'vs/base/common/uri';
1010
import { isMalformedFileUri } from 'vs/base/common/resources';
@@ -130,7 +130,7 @@ CommandsRegistry.registerCommand(SetEditorLayoutAPICommand.ID, adjustHandler(Set
130130

131131
CommandsRegistry.registerCommand('_workbench.downloadResource', function (accessor: ServicesAccessor, resource: URI) {
132132
const downloadService = accessor.get(IDownloadService);
133-
const location = posix.join(tmpdir(), generateUuid());
133+
const location = join(tmpdir(), generateUuid());
134134

135135
return downloadService.download(resource, location).then(() => URI.file(location));
136136
});

‎src/vs/workbench/api/node/extHostOutputService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { MainContext, MainThreadOutputServiceShape, IMainContext, ExtHostOutputServiceShape } from './extHost.protocol';
77
import * as vscode from 'vscode';
88
import { URI } from 'vs/base/common/uri';
9-
import { posix } from 'vs/base/common/path';
9+
import { join } from 'vs/base/common/path';
1010
import { OutputAppender } from 'vs/workbench/contrib/output/node/outputAppender';
1111
import { toLocalISOString } from 'vs/base/common/date';
1212
import { Event, Emitter } from 'vs/base/common/event';
@@ -103,7 +103,7 @@ export class ExtHostOutputChannelBackedByFile extends AbstractExtHostOutputChann
103103

104104
constructor(name: string, outputDir: string, proxy: MainThreadOutputServiceShape) {
105105
const fileName = `${ExtHostOutputChannelBackedByFile._namePool++}-${name}`;
106-
const file = URI.file(posix.join(outputDir, `${fileName}.log`));
106+
const file = URI.file(join(outputDir, `${fileName}.log`));
107107

108108
super(name, false, file, proxy);
109109
this._appender = new OutputAppender(fileName, file.fsPath);
@@ -150,7 +150,7 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
150150
private _visibleChannelDisposable: IDisposable;
151151

152152
constructor(logsLocation: URI, mainContext: IMainContext) {
153-
this._outputDir = posix.join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`);
153+
this._outputDir = join(logsLocation.fsPath, `output_logging_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`);
154154
this._proxy = mainContext.getProxy(MainContext.MainThreadOutputService);
155155
}
156156

‎src/vs/workbench/services/configurationResolver/common/variableResolver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
236236

237237
case 'relativeFile':
238238
if (folderUri) {
239-
return resolvedValue = paths.posix.normalize(paths.relative(folderUri.fsPath, filePath));
239+
return resolvedValue = paths.normalize(paths.relative(folderUri.fsPath, filePath));
240240
}
241241
return resolvedValue = filePath;
242242

‎src/vs/workbench/services/extensions/electron-browser/extensionService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
101101
@ILifecycleService private readonly _lifecycleService: ILifecycleService
102102
) {
103103
super();
104-
this._extensionHostLogsLocation = URI.file(path.posix.join(this._environmentService.logsPath, `exthost${this._windowService.getCurrentWindowId()}`));
104+
this._extensionHostLogsLocation = URI.file(path.join(this._environmentService.logsPath, `exthost${this._windowService.getCurrentWindowId()}`));
105105
this._registry = null;
106106
this._installedExtensionsReady = new Barrier();
107107
this._isDev = !this._environmentService.isBuilt || this._environmentService.isExtensionDevelopment;

0 commit comments

Comments
 (0)