debt - use our paths lib over node

src/vs/base/test/node/config.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as os from 'os';
 
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as fs from 'fs';
 import * as uuid from 'vs/base/common/uuid';
 import { ConfigWatcher } from 'vs/base/node/config';

src/vs/base/test/node/console.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { getFirstFrame } from 'vs/base/node/console';
-import { normalize } from 'path';
+import { normalize } from 'vs/base/common/paths.node';
 
 suite('Console', () => {
 

src/vs/base/test/node/extfs/extfs.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { Readable } from 'stream';
 import { canNormalize } from 'vs/base/common/normalization';
 import { isLinux, isWindows } from 'vs/base/common/platform';

src/vs/base/test/node/glob.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as glob from 'vs/base/common/glob';
 import { isWindows } from 'vs/base/common/platform';
 

src/vs/base/test/node/pfs.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as os from 'os';
 
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as fs from 'fs';
 
 import * as uuid from 'vs/base/common/uuid';

src/vs/base/test/node/storage/storage.test.ts

@@ -5,7 +5,7 @@
 
 import { Storage, SQLiteStorageDatabase, IStorageDatabase, ISQLiteStorageDatabaseOptions, IStorageItemsChangeEvent } from 'vs/base/node/storage';
 import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'path';
+import { join } from 'vs/base/common/paths.node';
 import { tmpdir } from 'os';
 import { equal, ok } from 'assert';
 import { mkdirp, del, writeFile, exists, unlink } from 'vs/base/node/pfs';

src/vs/base/test/node/utils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'path';
+import { join } from 'vs/base/common/paths.node';
 import { tmpdir } from 'os';
 import { mkdirp, del } from 'vs/base/node/pfs';
 

src/vs/code/electron-main/app.ts

@@ -65,7 +65,7 @@ import { registerContextMenuListener } from 'vs/base/parts/contextmenu/electron-
 import { storeBackgroundColor } from 'vs/code/electron-main/theme';
 import { join } from 'vs/base/common/paths';
 import { homedir } from 'os';
-import { sep } from 'path';
+import { sep } from 'vs/base/common/paths.node';
 import { localize } from 'vs/nls';
 import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
 import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/platform/remote/node/remoteAgentFileSystemChannel';

src/vs/code/electron-main/logUploader.ts

@@ -6,8 +6,8 @@
 import * as os from 'os';
 import * as cp from 'child_process';
 import * as fs from 'fs';
-import * as path from 'path';
 
+import * as path from 'vs/base/common/paths.node';
 import { localize } from 'vs/nls';
 import product from 'vs/platform/node/product';
 import { IRequestService } from 'vs/platform/request/node/request';

src/vs/code/electron-main/window.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as objects from 'vs/base/common/objects';
 import * as nls from 'vs/nls';
 import { URI } from 'vs/base/common/uri';

src/vs/code/electron-main/windows.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { basename, normalize, join, dirname } from 'path';
 import * as fs from 'fs';
+import { basename, normalize, join, dirname } from 'vs/base/common/paths.node';
 import { localize } from 'vs/nls';
 import * as arrays from 'vs/base/common/arrays';
 import { assign, mixin, equals } from 'vs/base/common/objects';

src/vs/code/test/electron-main/windowsStateStorage.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 
 import { restoreWindowsState, getWindowsStateStoreData } from 'vs/code/electron-main/windowsStateStorage';
 import { IWindowState as IWindowUIState, WindowMode } from 'vs/platform/windows/electron-main/windows';

src/vs/code/test/node/windowsFinder.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { findBestWindowOrFolderForFile, ISimpleWindow, IBestWindowOrFolderOptions } from 'vs/code/node/windowsFinder';
 import { OpenContext } from 'vs/platform/windows/common/windows';
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';

src/vs/platform/backup/electron-main/backupMainService.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'path';
 import * as crypto from 'crypto';
+import * as path from 'vs/base/common/paths.node';
 import * as platform from 'vs/base/common/platform';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import * as arrays from 'vs/base/common/arrays';

src/vs/platform/backup/test/electron-main/backupMainService.test.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import * as platform from 'vs/base/common/platform';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as pfs from 'vs/base/node/pfs';
 import { URI as Uri, URI } from 'vs/base/common/uri';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';

src/vs/platform/configuration/test/node/configurationService.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as fs from 'fs';
 
 import { Registry } from 'vs/platform/registry/common/platform';

src/vs/platform/diagnostics/electron-main/diagnosticsService.ts

@@ -13,7 +13,7 @@ import { virtualMachineHint } from 'vs/base/node/id';
 import { repeat, pad } from 'vs/base/common/strings';
 import { isWindows } from 'vs/base/common/platform';
 import { app } from 'electron';
-import { basename } from 'path';
+import { basename } from 'vs/base/common/paths.node';
 import { URI } from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 

src/vs/platform/environment/test/node/environmentService.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { parseExtensionHostPort, parseUserDataDir } from 'vs/platform/environment/node/environmentService';
 

src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts

@@ -9,7 +9,7 @@ import * as extfs from 'vs/base/node/extfs';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
-import { join } from 'path';
+import { join } from 'vs/base/common/paths.node';
 import { mkdirp } from 'vs/base/node/pfs';
 import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/node/extensionGalleryService';
 import { isUUID } from 'vs/base/common/uuid';

src/vs/platform/history/test/electron-main/historyStorage.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 
 import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { URI } from 'vs/base/common/uri';

src/vs/platform/node/test/zip.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as os from 'os';
 import { extract } from 'vs/platform/node/zip';
 import { generateUuid } from 'vs/base/common/uuid';

src/vs/platform/state/test/node/state.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as extfs from 'vs/base/node/extfs';
 import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices';
 import { FileStorage } from 'vs/platform/state/node/stateService';

src/vs/platform/storage/test/node/storageService.test.ts

@@ -8,7 +8,7 @@ import { StorageScope } from 'vs/platform/storage/common/storage';
 import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
 import { StorageService } from 'vs/platform/storage/node/storageService';
 import { generateUuid } from 'vs/base/common/uuid';
-import { join } from 'path';
+import { join } from 'vs/base/common/paths.node';
 import { tmpdir } from 'os';
 import { mkdirp, del } from 'vs/base/node/pfs';
 import { NullLogService } from 'vs/platform/log/common/log';

src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as os from 'os';
 import * as fs from 'fs';
 import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties';

src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts

@@ -14,7 +14,7 @@ import { buttonBackground } from 'vs/workbench/contrib/welcome/page/electron-bro
 import { embeddedEditorBackground } from 'vs/workbench/contrib/welcome/walkThrough/electron-browser/walkThroughPart';
 import { request, asText } from 'vs/base/node/request';
 import * as pfs from 'vs/base/node/pfs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as assert from 'assert';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { CancellationToken } from 'vs/base/common/cancellation';

src/vs/platform/update/electron-main/updateService.linux.ts

@@ -15,7 +15,7 @@ import { createUpdateURL, AbstractUpdateService } from 'vs/platform/update/elect
 import { asJson } from 'vs/base/node/request';
 import { shell } from 'electron';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { spawn } from 'child_process';
 import { realpath } from 'fs';
 

src/vs/platform/update/electron-main/updateService.snap.ts

@@ -9,7 +9,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycle
 import { IUpdateService, State, StateType, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { realpath, watch } from 'fs';
 import { spawn } from 'child_process';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

src/vs/platform/update/electron-main/updateService.win32.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as pfs from 'vs/base/node/pfs';
 import { memoize } from 'vs/base/common/decorators';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

src/vs/platform/workspaces/electron-main/workspacesMainService.ts

@@ -5,7 +5,7 @@
 
 import { IWorkspacesMainService, IWorkspaceIdentifier, hasWorkspaceFileExtension, UNTITLED_WORKSPACE_NAME, IResolvedWorkspace, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData, massageFolderPathForWorkspace, rewriteWorkspaceFileForNewLocation } from 'vs/platform/workspaces/common/workspaces';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { join, dirname } from 'path';
+import { join, dirname } from 'vs/base/common/paths.node';
 import { mkdirp, writeFile, readFile } from 'vs/base/node/pfs';
 import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
 import { isLinux } from 'vs/base/common/platform';

src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as extfs from 'vs/base/node/extfs';
 import * as pfs from 'vs/base/node/pfs';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts

@@ -5,7 +5,7 @@
 
 import * as sinon from 'sinon';
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as uuid from 'vs/base/common/uuid';

src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 
 import * as nls from 'vs/nls';
 import * as Objects from 'vs/base/common/objects';

src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import { Platform } from 'vs/base/common/platform';
 import { TerminalLinkHandler, LineColumnInfo } from 'vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler';
 import * as strings from 'vs/base/common/strings';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as sinon from 'sinon';
 
 class TestTerminalLinkHandler extends TerminalLinkHandler {

src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import * as platform from 'vs/base/common/platform';
 import * as os from 'os';
 import * as fs from 'fs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as pfs from 'vs/base/node/pfs';
 import { URI as Uri } from 'vs/base/common/uri';
 import { BackupFileService, BackupFilesModel, hashPath } from 'vs/workbench/services/backup/node/backupFileService';

src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts

@@ -6,7 +6,7 @@
 import * as sinon from 'sinon';
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as fs from 'fs';
 import * as json from 'vs/base/common/json';
 import { Registry } from 'vs/platform/registry/common/platform';

src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import * as fs from 'fs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as os from 'os';
 import { URI } from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';

src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as pfs from 'vs/base/node/pfs';
 
 import { normalizeRoots, ChokidarWatcherService } from '../chokidarWatcherService';

src/vs/workbench/services/files/test/electron-browser/fileService.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as os from 'os';
 import * as assert from 'assert';
 import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';

src/vs/workbench/services/files/test/electron-browser/resolver.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as assert from 'assert';
 
 import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileService';

src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts

@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as fs from 'fs';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import * as json from 'vs/base/common/json';
 import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { OS } from 'vs/base/common/platform';

src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { ScanCodeBinding } from 'vs/base/common/scanCode';

src/vs/workbench/services/search/test/node/rawSearchService.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';

src/vs/workbench/services/search/test/node/search.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { join, normalize } from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';

src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import * as glob from 'vs/base/common/glob';

src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
-import { basename } from 'path';
+import { basename } from 'vs/base/common/paths.node';
 import { ExtHostWorkspaceProvider } from 'vs/workbench/api/node/extHostWorkspace';
 import { TestRPCProtocol } from './testRPCProtocol';
 import { normalize } from 'vs/base/common/paths';

src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import * as minimist from 'minimist';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
 import { IModelService } from 'vs/editor/common/services/modelService';

src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts

@@ -14,7 +14,7 @@ import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as minimist from 'minimist';
-import * as path from 'path';
+import * as path from 'vs/base/common/paths.node';
 import { SearchService } from 'vs/workbench/services/search/node/searchService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { TestEnvironmentService, TestContextService, TestEditorService, TestEditorGroupsService, TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';