From 622b3d62dd92ea1bcdc7d250e0a7565b018edcee Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 12 Feb 2019 20:36:09 +0100 Subject: [PATCH] paths - paths.node.ts => path.ts --- src/vs/base/common/comparers.ts | 2 +- src/vs/base/common/extpath.ts | 2 +- src/vs/base/common/glob.ts | 2 +- src/vs/base/common/labels.ts | 2 +- src/vs/base/common/mime.ts | 2 +- src/vs/base/common/{paths.node.ts => path.ts} | 3 ++- src/vs/base/common/resources.ts | 2 +- src/vs/base/node/config.ts | 2 +- src/vs/base/node/extfs.ts | 2 +- src/vs/base/node/pfs.ts | 2 +- src/vs/base/node/processes.ts | 2 +- src/vs/base/node/stats.ts | 2 +- src/vs/base/node/storage.ts | 2 +- src/vs/base/parts/ipc/node/ipc.net.ts | 2 +- src/vs/base/parts/quickopen/common/quickOpenScorer.ts | 2 +- .../parts/quickopen/test/common/quickOpenScorer.test.ts | 2 +- .../test/common/{paths.node.test.ts => path.test.ts} | 9 +++++---- src/vs/base/test/node/config.test.ts | 2 +- src/vs/base/test/node/console.test.ts | 2 +- src/vs/base/test/node/extfs/extfs.test.ts | 2 +- src/vs/base/test/node/glob.test.ts | 2 +- src/vs/base/test/node/pfs.test.ts | 2 +- src/vs/base/test/node/storage/storage.test.ts | 2 +- src/vs/base/test/node/utils.ts | 2 +- .../contrib/languagePackCachedDataCleaner.ts | 2 +- .../sharedProcess/contrib/logsDataCleaner.ts | 2 +- .../sharedProcess/contrib/nodeCachedDataCleaner.ts | 2 +- .../sharedProcess/contrib/storageDataCleaner.ts | 2 +- src/vs/code/electron-main/app.ts | 2 +- src/vs/code/electron-main/logUploader.ts | 2 +- src/vs/code/electron-main/window.ts | 2 +- src/vs/code/electron-main/windows.ts | 2 +- src/vs/code/node/cli.ts | 2 +- src/vs/code/node/cliProcessMain.ts | 2 +- src/vs/code/node/paths.ts | 2 +- src/vs/code/node/wait.ts | 2 +- .../code/test/electron-main/windowsStateStorage.test.ts | 2 +- src/vs/code/test/node/windowsFinder.test.ts | 2 +- src/vs/editor/contrib/snippet/snippetVariables.ts | 2 +- .../platform/backup/electron-main/backupMainService.ts | 2 +- .../backup/test/electron-main/backupMainService.test.ts | 2 +- .../configuration/test/node/configurationService.test.ts | 2 +- .../diagnostics/electron-main/diagnosticsService.ts | 2 +- src/vs/platform/download/node/downloadIpc.ts | 2 +- src/vs/platform/environment/node/environmentService.ts | 2 +- .../environment/test/node/environmentService.test.ts | 2 +- .../extensionManagement/node/extensionGalleryService.ts | 2 +- .../extensionManagement/node/extensionLifecycle.ts | 2 +- .../node/extensionManagementService.ts | 2 +- .../extensionManagement/node/extensionsManifestCache.ts | 2 +- .../test/node/extensionGalleryService.test.ts | 2 +- src/vs/platform/files/common/files.ts | 2 +- .../history/test/electron-main/historyStorage.test.ts | 2 +- src/vs/platform/localizations/node/localizations.ts | 2 +- src/vs/platform/log/node/spdlogService.ts | 2 +- src/vs/platform/node/package.ts | 2 +- src/vs/platform/node/product.ts | 2 +- src/vs/platform/node/test/zip.test.ts | 2 +- src/vs/platform/node/zip.ts | 2 +- src/vs/platform/state/node/stateService.ts | 2 +- src/vs/platform/state/test/node/state.test.ts | 2 +- src/vs/platform/storage/node/storageMainService.ts | 2 +- src/vs/platform/storage/node/storageService.ts | 2 +- src/vs/platform/storage/test/node/storageService.test.ts | 2 +- src/vs/platform/telemetry/common/telemetryUtils.ts | 2 +- .../test/electron-browser/commonProperties.test.ts | 2 +- .../test/electron-browser/colorRegistry.releaseTest.ts | 2 +- .../platform/update/electron-main/updateService.linux.ts | 2 +- .../platform/update/electron-main/updateService.snap.ts | 2 +- .../platform/update/electron-main/updateService.win32.ts | 2 +- src/vs/platform/workspace/common/workspace.ts | 2 +- src/vs/platform/workspaces/common/workspaces.ts | 2 +- .../workspaces/electron-main/workspacesMainService.ts | 2 +- .../test/electron-main/workspacesMainService.test.ts | 2 +- src/vs/workbench/api/node/apiCommands.ts | 2 +- src/vs/workbench/api/node/extHostExtensionService.ts | 2 +- src/vs/workbench/api/node/extHostOutputService.ts | 2 +- src/vs/workbench/api/node/extHostSearch.fileIndex.ts | 2 +- src/vs/workbench/api/node/extHostTask.ts | 2 +- src/vs/workbench/api/node/extHostTypes.ts | 2 +- src/vs/workbench/api/node/extHostWorkspace.ts | 2 +- src/vs/workbench/browser/parts/titlebar/titlebarPart.ts | 2 +- src/vs/workbench/common/editor/untitledEditorInput.ts | 2 +- src/vs/workbench/common/resources.ts | 2 +- .../contrib/cli/electron-browser/cli.contribution.ts | 2 +- .../contrib/codeEditor/browser/largeFileOptimizations.ts | 2 +- src/vs/workbench/contrib/debug/browser/linkDetector.ts | 2 +- .../workbench/contrib/debug/browser/loadedScriptsView.ts | 2 +- src/vs/workbench/contrib/debug/common/debugModel.ts | 2 +- src/vs/workbench/contrib/debug/common/debugSource.ts | 2 +- src/vs/workbench/contrib/debug/common/debugUtils.ts | 2 +- src/vs/workbench/contrib/debug/node/debugAdapter.ts | 2 +- .../execution/electron-browser/execution.contribution.ts | 2 +- .../execution/electron-browser/terminalService.ts | 2 +- .../electron-browser/extensionsAutoProfiler.ts | 2 +- .../electron-browser/runtimeExtensionsEditor.ts | 2 +- .../test/electron-browser/extensionsTipsService.test.ts | 2 +- .../contrib/files/common/editors/fileEditorInput.ts | 2 +- src/vs/workbench/contrib/files/common/explorerModel.ts | 2 +- .../contrib/files/electron-browser/files.contribution.ts | 2 +- .../files/electron-browser/views/explorerViewer.ts | 2 +- .../contrib/markers/electron-browser/markersPanel.ts | 2 +- .../markers/electron-browser/markersTreeViewer.ts | 2 +- src/vs/workbench/contrib/output/browser/logViewer.ts | 2 +- .../contrib/output/electron-browser/outputServices.ts | 2 +- .../performance/electron-browser/startupProfiler.ts | 2 +- .../workbench/contrib/search/browser/openFileHandler.ts | 2 +- .../contrib/search/browser/search.contribution.ts | 2 +- .../contrib/search/browser/searchResultsView.ts | 2 +- src/vs/workbench/contrib/search/common/queryBuilder.ts | 2 +- .../contrib/snippets/browser/configureSnippets.ts | 2 +- .../workbench/contrib/snippets/browser/snippetsFile.ts | 2 +- .../contrib/tasks/electron-browser/terminalTaskSystem.ts | 2 +- .../terminal/electron-browser/terminalConfigHelper.ts | 2 +- .../terminal/electron-browser/terminalInstance.ts | 2 +- .../terminal/electron-browser/terminalLinkHandler.ts | 2 +- .../contrib/terminal/node/terminalEnvironment.ts | 2 +- .../workbench/contrib/terminal/node/terminalProcess.ts | 2 +- .../test/electron-browser/terminalLinkHandler.test.ts | 2 +- .../test/electron-browser/themes.test.contribution.ts | 2 +- .../contrib/webview/electron-browser/webviewProtocols.ts | 2 +- .../contrib/welcome/page/electron-browser/welcomePage.ts | 2 +- src/vs/workbench/electron-browser/main.ts | 2 +- .../workbench/services/backup/node/backupFileService.ts | 2 +- .../test/electron-browser/backupFileService.test.ts | 2 +- .../services/configuration/node/configuration.ts | 2 +- .../electron-browser/configurationEditingService.test.ts | 2 +- .../test/electron-browser/configurationService.test.ts | 2 +- .../configurationResolver/common/variableResolver.ts | 2 +- .../electron-browser/cachedExtensionScanner.ts | 2 +- .../extensions/electron-browser/extensionService.ts | 2 +- .../services/extensions/node/extensionPoints.ts | 2 +- .../services/files/electron-browser/encoding.ts | 2 +- .../services/files/electron-browser/fileService.ts | 2 +- .../files/node/watcher/nsfw/nsfwWatcherService.ts | 2 +- .../watcher/unix/test/chockidarWatcherService.test.ts | 2 +- .../services/files/node/watcher/win32/watcherService.ts | 2 +- .../files/test/electron-browser/fileService.test.ts | 2 +- .../files/test/electron-browser/resolver.test.ts | 2 +- .../test/electron-browser/keybindingEditing.test.ts | 2 +- .../services/keybinding/test/keyboardMapperTestUtils.ts | 2 +- src/vs/workbench/services/label/test/label.test.ts | 2 +- src/vs/workbench/services/search/node/fileSearch.ts | 2 +- .../workbench/services/search/node/fileSearchManager.ts | 2 +- .../workbench/services/search/node/rawSearchService.ts | 2 +- .../workbench/services/search/node/ripgrepFileSearch.ts | 2 +- .../services/search/node/ripgrepTextSearchEngine.ts | 2 +- .../workbench/services/search/node/textSearchManager.ts | 2 +- .../services/search/test/node/rawSearchService.test.ts | 2 +- .../workbench/services/search/test/node/search.test.ts | 2 +- .../search/test/node/textSearch.integrationTest.ts | 2 +- .../services/themes/common/fileIconThemeData.ts | 2 +- .../services/themes/electron-browser/colorThemeData.ts | 2 +- .../test/electron-browser/api/extHostWorkspace.test.ts | 2 +- .../electron-browser/quickopen.perf.integrationTest.ts | 2 +- .../electron-browser/textsearch.perf.integrationTest.ts | 2 +- 156 files changed, 161 insertions(+), 159 deletions(-) rename src/vs/base/common/{paths.node.ts => path.ts} (99%) rename src/vs/base/test/common/{paths.node.test.ts => path.test.ts} (98%) diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts index b5ac2014f83..f5b9b26edd6 100644 --- a/src/vs/base/common/comparers.ts +++ b/src/vs/base/common/comparers.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as strings from 'vs/base/common/strings'; -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; import { IdleValue } from 'vs/base/common/async'; let intlFileNameCollator: IdleValue<{ collator: Intl.Collator, collatorIsNumeric: boolean }>; diff --git a/src/vs/base/common/extpath.ts b/src/vs/base/common/extpath.ts index c8bf7a0a229..ae6e731f809 100644 --- a/src/vs/base/common/extpath.ts +++ b/src/vs/base/common/extpath.ts @@ -6,7 +6,7 @@ import { isWindows } from 'vs/base/common/platform'; import { startsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings'; import { CharCode } from 'vs/base/common/charCode'; -import { sep, posix } from 'vs/base/common/paths.node'; +import { sep, posix } from 'vs/base/common/path'; function isPathSeparator(code: number) { return code === CharCode.Slash || code === CharCode.Backslash; diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts index d18b428ba66..ac7a3d77883 100644 --- a/src/vs/base/common/glob.ts +++ b/src/vs/base/common/glob.ts @@ -6,7 +6,7 @@ import * as arrays from 'vs/base/common/arrays'; import * as strings from 'vs/base/common/strings'; import * as extpath from 'vs/base/common/extpath'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import { LRUCache } from 'vs/base/common/map'; import { CharCode } from 'vs/base/common/charCode'; import { isThenable } from 'vs/base/common/async'; diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 2e4385d7be1..38a6a55b785 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -5,7 +5,7 @@ import { URI } from 'vs/base/common/uri'; import { normalize } from 'vs/base/common/extpath'; -import { sep, posix } from 'vs/base/common/paths.node'; +import { sep, posix } from 'vs/base/common/path'; import { endsWith, ltrim, startsWithIgnoreCase, rtrim, startsWith } from 'vs/base/common/strings'; import { Schemas } from 'vs/base/common/network'; import { isLinux, isWindows, isMacintosh } from 'vs/base/common/platform'; diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts index 333357c8784..10ab55362b1 100644 --- a/src/vs/base/common/mime.ts +++ b/src/vs/base/common/mime.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { basename, posix, extname } from 'vs/base/common/paths.node'; +import { basename, posix, extname } from 'vs/base/common/path'; import { endsWith, startsWithUTF8BOM, startsWith } from 'vs/base/common/strings'; import { coalesce } from 'vs/base/common/arrays'; import { match } from 'vs/base/common/glob'; diff --git a/src/vs/base/common/paths.node.ts b/src/vs/base/common/path.ts similarity index 99% rename from src/vs/base/common/paths.node.ts rename to src/vs/base/common/path.ts index 010dd1b8bb3..53bd495fd8d 100644 --- a/src/vs/base/common/paths.node.ts +++ b/src/vs/base/common/path.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// extracted from nodejs commit 'https://github.com/nodejs/node/tree/43dd49c9782848c25e5b03448c8a0f923f13c158' +// NOTE: VSCode's copy of nodejs path library to be usable in common (non-node) namespace +// Copied from: https://github.com/nodejs/node/tree/43dd49c9782848c25e5b03448c8a0f923f13c158 // Copyright Joyent, Inc. and other Node contributors. // diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts index 9e8e58bc1fa..bd4ffbac6c1 100644 --- a/src/vs/base/common/resources.ts +++ b/src/vs/base/common/resources.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as extpath from 'vs/base/common/extpath'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; import { equalsIgnoreCase } from 'vs/base/common/strings'; import { Schemas } from 'vs/base/common/network'; diff --git a/src/vs/base/node/config.ts b/src/vs/base/node/config.ts index 7956da8f52c..5ef2193997f 100644 --- a/src/vs/base/node/config.ts +++ b/src/vs/base/node/config.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import { dirname, basename } from 'vs/base/common/paths.node'; +import { dirname, basename } from 'vs/base/common/path'; import * as objects from 'vs/base/common/objects'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts index f81bcb2ae53..866ba70ddc9 100644 --- a/src/vs/base/node/extfs.ts +++ b/src/vs/base/node/extfs.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import { nfcall } from 'vs/base/common/async'; import { normalizeNFC } from 'vs/base/common/normalization'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts index 7a4b1b1c8fd..28089f4aeab 100644 --- a/src/vs/base/node/pfs.ts +++ b/src/vs/base/node/pfs.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as extfs from 'vs/base/node/extfs'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { nfcall, Queue } from 'vs/base/common/async'; import * as fs from 'fs'; import * as os from 'os'; diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index 33b3e4d0223..eeaa7c6bc44 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import * as cp from 'child_process'; import * as nls from 'vs/nls'; diff --git a/src/vs/base/node/stats.ts b/src/vs/base/node/stats.ts index 933a0d4d9b3..4b89e868fe1 100644 --- a/src/vs/base/node/stats.ts +++ b/src/vs/base/node/stats.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { readdir, stat, exists, readFile } from 'fs'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { parse, ParseError } from 'vs/base/common/json'; export interface WorkspaceStatItem { diff --git a/src/vs/base/node/storage.ts b/src/vs/base/node/storage.ts index 92e0983d35c..546396f1959 100644 --- a/src/vs/base/node/storage.ts +++ b/src/vs/base/node/storage.ts @@ -9,7 +9,7 @@ import { Emitter, Event } from 'vs/base/common/event'; import { ThrottledDelayer, timeout } from 'vs/base/common/async'; import { isUndefinedOrNull } from 'vs/base/common/types'; import { mapToString, setToString } from 'vs/base/common/map'; -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { copy, renameIgnoreError, unlink } from 'vs/base/node/pfs'; import { fill } from 'vs/base/common/arrays'; diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts index dfa7c3000df..08f2def654f 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts @@ -6,7 +6,7 @@ import { Socket, Server as NetServer, createConnection, createServer } from 'net'; import { Event, Emitter } from 'vs/base/common/event'; import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/node/ipc'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { tmpdir } from 'os'; import { generateUuid } from 'vs/base/common/uuid'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/base/parts/quickopen/common/quickOpenScorer.ts b/src/vs/base/parts/quickopen/common/quickOpenScorer.ts index 66d53e1782d..ae2f38541cc 100644 --- a/src/vs/base/parts/quickopen/common/quickOpenScorer.ts +++ b/src/vs/base/parts/quickopen/common/quickOpenScorer.ts @@ -5,7 +5,7 @@ import { compareAnything } from 'vs/base/common/comparers'; import { matchesPrefix, IMatch, matchesCamelCase, isUpper } from 'vs/base/common/filters'; -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; import { isWindows, isLinux } from 'vs/base/common/platform'; import { stripWildcards, equalsIgnoreCase } from 'vs/base/common/strings'; import { CharCode } from 'vs/base/common/charCode'; diff --git a/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts b/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts index 92dc797004a..47c51b87902 100644 --- a/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts +++ b/src/vs/base/parts/quickopen/test/common/quickOpenScorer.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as scorer from 'vs/base/parts/quickopen/common/quickOpenScorer'; import { URI } from 'vs/base/common/uri'; -import { basename, dirname, sep } from 'vs/base/common/paths.node'; +import { basename, dirname, sep } from 'vs/base/common/path'; import { isWindows } from 'vs/base/common/platform'; class ResourceAccessorClass implements scorer.IItemAccessor { diff --git a/src/vs/base/test/common/paths.node.test.ts b/src/vs/base/test/common/path.test.ts similarity index 98% rename from src/vs/base/test/common/paths.node.test.ts rename to src/vs/base/test/common/path.test.ts index c4b9a2d2194..f16f61a9bea 100644 --- a/src/vs/base/test/common/paths.node.test.ts +++ b/src/vs/base/test/common/path.test.ts @@ -3,7 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// extracted from nodejs commit 'https://github.com/nodejs/node/tree/43dd49c9782848c25e5b03448c8a0f923f13c158' +// NOTE: VSCode's copy of nodejs path library to be usable in common (non-node) namespace +// Copied from: https://github.com/nodejs/node/tree/43dd49c9782848c25e5b03448c8a0f923f13c158 // Copyright Joyent, Inc. and other Node contributors. // @@ -27,7 +28,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { isWindows } from 'vs/base/common/platform'; suite('Paths (Node Implementation)', () => { @@ -436,8 +437,8 @@ suite('Paths (Node Implementation)', () => { }); test('basename', () => { - assert.strictEqual(path.basename(__filename), 'paths.node.test.js'); - assert.strictEqual(path.basename(__filename, '.js'), 'paths.node.test'); + assert.strictEqual(path.basename(__filename), 'path.test.js'); + assert.strictEqual(path.basename(__filename, '.js'), 'path.test'); assert.strictEqual(path.basename('.js', '.js'), ''); assert.strictEqual(path.basename(''), ''); assert.strictEqual(path.basename('/dir/basename.ext'), 'basename.ext'); diff --git a/src/vs/base/test/node/config.test.ts b/src/vs/base/test/node/config.test.ts index 7c79d32b5c7..05539350074 100644 --- a/src/vs/base/test/node/config.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import * as uuid from 'vs/base/common/uuid'; import { ConfigWatcher } from 'vs/base/node/config'; diff --git a/src/vs/base/test/node/console.test.ts b/src/vs/base/test/node/console.test.ts index d24565d8d62..f72dbbc4c30 100644 --- a/src/vs/base/test/node/console.test.ts +++ b/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 'vs/base/common/paths.node'; +import { normalize } from 'vs/base/common/path'; suite('Console', () => { diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts index a87694a52e4..fd044fac056 100644 --- a/src/vs/base/test/node/extfs/extfs.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { Readable } from 'stream'; import { canNormalize } from 'vs/base/common/normalization'; import { isLinux, isWindows } from 'vs/base/common/platform'; diff --git a/src/vs/base/test/node/glob.test.ts b/src/vs/base/test/node/glob.test.ts index df1d03cc93d..5728751678c 100644 --- a/src/vs/base/test/node/glob.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as glob from 'vs/base/common/glob'; import { isWindows } from 'vs/base/common/platform'; diff --git a/src/vs/base/test/node/pfs.test.ts b/src/vs/base/test/node/pfs.test.ts index c771beeb73c..2f9d6268e6e 100644 --- a/src/vs/base/test/node/pfs.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import * as uuid from 'vs/base/common/uuid'; diff --git a/src/vs/base/test/node/storage/storage.test.ts b/src/vs/base/test/node/storage/storage.test.ts index 9c135b7e6b8..67c918e9e77 100644 --- a/src/vs/base/test/node/storage/storage.test.ts +++ b/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 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { tmpdir } from 'os'; import { equal, ok } from 'assert'; import { mkdirp, del, writeFile, exists, unlink } from 'vs/base/node/pfs'; diff --git a/src/vs/base/test/node/utils.ts b/src/vs/base/test/node/utils.ts index 6b041b24110..37190dadfd9 100644 --- a/src/vs/base/test/node/utils.ts +++ b/src/vs/base/test/node/utils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { generateUuid } from 'vs/base/common/uuid'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { tmpdir } from 'os'; import { mkdirp, del } from 'vs/base/node/pfs'; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts index 3a66b6b82bb..edd44ec556f 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as pfs from 'vs/base/node/pfs'; import { IStringDictionary } from 'vs/base/common/collections'; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts index df8d7b0684f..8d714e48d1d 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { join, dirname, basename } from 'vs/base/common/paths.node'; +import { join, dirname, basename } from 'vs/base/common/path'; import { readdir, rimraf } from 'vs/base/node/pfs'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts index 6eddfa6bf32..3655374314c 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { basename, dirname, join } from 'vs/base/common/paths.node'; +import { basename, dirname, join } from 'vs/base/common/path'; import { onUnexpectedError } from 'vs/base/common/errors'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { readdir, rimraf, stat } from 'vs/base/node/pfs'; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts index 0d7af7c2721..c94a47612d3 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { readdir, readFile, rimraf } from 'vs/base/node/pfs'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index baacf0bd744..c135f674cf1 100644 --- a/src/vs/code/electron-main/app.ts +++ b/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/extpath'; import { homedir } from 'os'; -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; 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'; diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts index 3fd856dd165..c335d0cb77c 100644 --- a/src/vs/code/electron-main/logUploader.ts +++ b/src/vs/code/electron-main/logUploader.ts @@ -7,7 +7,7 @@ import * as os from 'os'; import * as cp from 'child_process'; import * as fs from 'fs'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { localize } from 'vs/nls'; import product from 'vs/platform/node/product'; import { IRequestService } from 'vs/platform/request/node/request'; diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 04560450a9f..46eae2f76ad 100644 --- a/src/vs/code/electron-main/window.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as objects from 'vs/base/common/objects'; import * as nls from 'vs/nls'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 31ae1281827..c3f022b4ad7 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import { basename, normalize, join, dirname } from 'vs/base/common/paths.node'; +import { basename, normalize, join, dirname } from 'vs/base/common/path'; import { localize } from 'vs/nls'; import * as arrays from 'vs/base/common/arrays'; import { assign, mixin, equals } from 'vs/base/common/objects'; diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index f5f2990c331..9969275a53b 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -9,7 +9,7 @@ import { buildHelpMessage, buildVersionMessage } from 'vs/platform/environment/n import { ParsedArgs } from 'vs/platform/environment/common/environment'; import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import * as os from 'os'; import * as fs from 'fs'; import { whenDeleted } from 'vs/base/node/pfs'; diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 38ed4798dfb..323a1082f2b 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -6,7 +6,7 @@ import { localize } from 'vs/nls'; import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as semver from 'semver'; import { sequence } from 'vs/base/common/async'; diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts index 19b4d2b9944..9154dbb27b5 100644 --- a/src/vs/code/node/paths.ts +++ b/src/vs/code/node/paths.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as arrays from 'vs/base/common/arrays'; import * as strings from 'vs/base/common/strings'; import * as extpath from 'vs/base/common/extpath'; diff --git a/src/vs/code/node/wait.ts b/src/vs/code/node/wait.ts index 70e118e74dc..9f9b9aaa41d 100644 --- a/src/vs/code/node/wait.ts +++ b/src/vs/code/node/wait.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { tmpdir } from 'os'; import { writeFile } from 'vs/base/node/pfs'; diff --git a/src/vs/code/test/electron-main/windowsStateStorage.test.ts b/src/vs/code/test/electron-main/windowsStateStorage.test.ts index 2d33e1e4c5a..d87d855a36b 100644 --- a/src/vs/code/test/electron-main/windowsStateStorage.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { restoreWindowsState, getWindowsStateStoreData } from 'vs/code/electron-main/windowsStateStorage'; import { IWindowState as IWindowUIState, WindowMode } from 'vs/platform/windows/electron-main/windows'; diff --git a/src/vs/code/test/node/windowsFinder.test.ts b/src/vs/code/test/node/windowsFinder.test.ts index 0bdb4bc0222..e18521facc4 100644 --- a/src/vs/code/test/node/windowsFinder.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; 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'; diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index 7b7b9546a3c..dd7591c79ab 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import { basename, dirname } from 'vs/base/common/paths.node'; +import { basename, dirname } from 'vs/base/common/path'; import { ITextModel } from 'vs/editor/common/model'; import { Selection } from 'vs/editor/common/core/selection'; import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/snippetParser'; diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts index 344aa8c595b..c192571d5b5 100644 --- a/src/vs/platform/backup/electron-main/backupMainService.ts +++ b/src/vs/platform/backup/electron-main/backupMainService.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as crypto from 'crypto'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import { writeFileAndFlushSync } from 'vs/base/node/extfs'; import * as arrays from 'vs/base/common/arrays'; diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts index cc9fcf9879f..feefaef22d0 100644 --- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; 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'; diff --git a/src/vs/platform/configuration/test/node/configurationService.test.ts b/src/vs/platform/configuration/test/node/configurationService.test.ts index b466bf45bd8..e3c45c59f28 100644 --- a/src/vs/platform/configuration/test/node/configurationService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts b/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts index 4f8f7dd4a74..a539a7cabf4 100644 --- a/src/vs/platform/diagnostics/electron-main/diagnosticsService.ts +++ b/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 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts index 86567347671..53144c3f1db 100644 --- a/src/vs/platform/download/node/downloadIpc.ts +++ b/src/vs/platform/download/node/downloadIpc.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { URI } from 'vs/base/common/uri'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import { IChannel, IServerChannel } from 'vs/base/parts/ipc/node/ipc'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index cfeab84c7f7..9427179597d 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -7,7 +7,7 @@ import { IEnvironmentService, ParsedArgs, IDebugParams, IExtensionHostDebugParam import * as crypto from 'crypto'; import * as paths from 'vs/base/node/paths'; import * as os from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { memoize } from 'vs/base/common/decorators'; import pkg from 'vs/platform/node/package'; import product from 'vs/platform/node/product'; diff --git a/src/vs/platform/environment/test/node/environmentService.test.ts b/src/vs/platform/environment/test/node/environmentService.test.ts index 2ca40d61b5c..b465072e7fa 100644 --- a/src/vs/platform/environment/test/node/environmentService.test.ts +++ b/src/vs/platform/environment/test/node/environmentService.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { parseArgs } from 'vs/platform/environment/node/argv'; import { parseExtensionHostPort, parseUserDataDir } from 'vs/platform/environment/node/environmentService'; diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index 75101e9d436..c6d2d394344 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { tmpdir } from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { distinct } from 'vs/base/common/arrays'; import { getErrorMessage, isPromiseCanceledError, canceled } from 'vs/base/common/errors'; import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionIdentifier, IReportedExtension, InstallOperation, ITranslation, IGalleryExtensionVersion, IGalleryExtensionAssets, isIExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement'; diff --git a/src/vs/platform/extensionManagement/node/extensionLifecycle.ts b/src/vs/platform/extensionManagement/node/extensionLifecycle.ts index b953dc3a462..2b55aa25e5f 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/paths.node'; +import { posix } 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'; diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index d6521e19348..f5aa4135fd4 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as pfs from 'vs/base/node/pfs'; import { assign } from 'vs/base/common/objects'; import { toDisposable, Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts index c34c98bd490..72cffa02dc2 100644 --- a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts +++ b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Disposable } from 'vs/base/common/lifecycle'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IExtensionManagementService, DidInstallExtensionEvent, DidUninstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement'; import { MANIFEST_CACHE_FOLDER, USER_MANIFEST_CACHE_FILE } from 'vs/platform/extensions/common/extensions'; diff --git a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts index 44691e2bb18..1b9af7cde94 100644 --- a/src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts +++ b/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 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { mkdirp } from 'vs/base/node/pfs'; import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/node/extensionGalleryService'; import { isUUID } from 'vs/base/common/uuid'; diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index 3d347c78fe0..fa87bbd829f 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; import * as glob from 'vs/base/common/glob'; import { isLinux } from 'vs/base/common/platform'; diff --git a/src/vs/platform/history/test/electron-main/historyStorage.test.ts b/src/vs/platform/history/test/electron-main/historyStorage.test.ts index 6ecba284527..bf7f3acaaa4 100644 --- a/src/vs/platform/history/test/electron-main/historyStorage.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/platform/localizations/node/localizations.ts b/src/vs/platform/localizations/node/localizations.ts index eec39fd9f47..a0740ffa1a1 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/paths.node'; +import { posix } from 'vs/base/common/path'; interface ILanguagePack { hash: string; diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts index 6beacf8edbb..76cb0865e56 100644 --- a/src/vs/platform/log/node/spdlogService.ts +++ b/src/vs/platform/log/node/spdlogService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { ILogService, LogLevel, NullLogService, AbstractLogService } from 'vs/platform/log/common/log'; import * as spdlog from 'spdlog'; diff --git a/src/vs/platform/node/package.ts b/src/vs/platform/node/package.ts index a9ad6b9677d..d39c5877d6a 100644 --- a/src/vs/platform/node/package.ts +++ b/src/vs/platform/node/package.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; export interface IPackageConfiguration { diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts index fe08242a330..00494b7e39a 100644 --- a/src/vs/platform/node/product.ts +++ b/src/vs/platform/node/product.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; export interface IProductConfiguration { diff --git a/src/vs/platform/node/test/zip.test.ts b/src/vs/platform/node/test/zip.test.ts index 31841ae5d4c..1a2d18ef6d7 100644 --- a/src/vs/platform/node/test/zip.test.ts +++ b/src/vs/platform/node/test/zip.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as os from 'os'; import { extract } from 'vs/platform/node/zip'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/vs/platform/node/zip.ts b/src/vs/platform/node/zip.ts index 8bbb76a8bcc..8c235059bd0 100644 --- a/src/vs/platform/node/zip.ts +++ b/src/vs/platform/node/zip.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { createWriteStream, WriteStream } from 'fs'; import { Readable } from 'stream'; import { nfcall, ninvoke, Sequencer, createCancelablePromise } from 'vs/base/common/async'; diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts index a998cacee46..412ea4da01a 100644 --- a/src/vs/platform/state/node/stateService.ts +++ b/src/vs/platform/state/node/stateService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { writeFileAndFlushSync } from 'vs/base/node/extfs'; diff --git a/src/vs/platform/state/test/node/state.test.ts b/src/vs/platform/state/test/node/state.test.ts index 352b1ccac2a..abb30e484a9 100644 --- a/src/vs/platform/state/test/node/state.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as extfs from 'vs/base/node/extfs'; import { getRandomTestPath } from 'vs/workbench/test/workbenchTestServices'; import { FileStorage } from 'vs/platform/state/node/stateService'; diff --git a/src/vs/platform/storage/node/storageMainService.ts b/src/vs/platform/storage/node/storageMainService.ts index 6b861f5a41d..858acbf945f 100644 --- a/src/vs/platform/storage/node/storageMainService.ts +++ b/src/vs/platform/storage/node/storageMainService.ts @@ -9,7 +9,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { ILogService, LogLevel } from 'vs/platform/log/common/log'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IStorage, Storage, SQLiteStorageDatabase, ISQLiteStorageDatabaseLoggingOptions, InMemoryStorageDatabase } from 'vs/base/node/storage'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { mark } from 'vs/base/common/performance'; import { exists, readdir } from 'vs/base/node/pfs'; import { Database } from 'vscode-sqlite3'; diff --git a/src/vs/platform/storage/node/storageService.ts b/src/vs/platform/storage/node/storageService.ts index 8e3a4d689a9..6b232493c2c 100644 --- a/src/vs/platform/storage/node/storageService.ts +++ b/src/vs/platform/storage/node/storageService.ts @@ -12,7 +12,7 @@ import { Action } from 'vs/base/common/actions'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { localize } from 'vs/nls'; import { mark, getDuration } from 'vs/base/common/performance'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { copy, exists, mkdirp, writeFile } from 'vs/base/node/pfs'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IWorkspaceInitializationPayload, isWorkspaceIdentifier, isSingleFolderWorkspaceInitializationPayload } from 'vs/platform/workspaces/common/workspaces'; diff --git a/src/vs/platform/storage/test/node/storageService.test.ts b/src/vs/platform/storage/test/node/storageService.test.ts index 1b96e01e427..618892479eb 100644 --- a/src/vs/platform/storage/test/node/storageService.test.ts +++ b/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 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { tmpdir } from 'os'; import { mkdirp, del } from 'vs/base/node/pfs'; import { NullLogService } from 'vs/platform/log/common/log'; diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index 3c7b1c6f3a8..fe6540c6291 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/src/vs/platform/telemetry/common/telemetryUtils.ts @@ -5,7 +5,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { guessMimeTypes } from 'vs/base/common/mime'; -import { extname } from 'vs/base/common/paths.node'; +import { extname } from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; import { IConfigurationService, ConfigurationTarget, ConfigurationTargetToString } from 'vs/platform/configuration/common/configuration'; import { IKeybindingService, KeybindingSource } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts b/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts index 9b3ced7c9b1..92f60d3c088 100644 --- a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as os from 'os'; import * as fs from 'fs'; import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties'; diff --git a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts b/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts index dd5798e6a7a..32f092e1c11 100644 --- a/src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as assert from 'assert'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts index 4f6c1826f9b..a85227b9684 100644 --- a/src/vs/platform/update/electron-main/updateService.linux.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { spawn } from 'child_process'; import { realpath } from 'fs'; diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts index c4052dd4175..6f5040901c8 100644 --- a/src/vs/platform/update/electron-main/updateService.snap.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { realpath, watch } from 'fs'; import { spawn } from 'child_process'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index fde48eba786..f4384e5a4ac 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as pfs from 'vs/base/node/pfs'; import { memoize } from 'vs/base/common/decorators'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index 3be9353605b..418d131224e 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { URI } from 'vs/base/common/uri'; -import { isAbsolute } from 'vs/base/common/paths.node'; +import { isAbsolute } from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { TernarySearchTree } from 'vs/base/common/map'; diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts index 6074cf947fd..38910717325 100644 --- a/src/vs/platform/workspaces/common/workspaces.ts +++ b/src/vs/platform/workspaces/common/workspaces.ts @@ -10,7 +10,7 @@ import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/works import { URI, UriComponents } from 'vs/base/common/uri'; import { isEqualOrParent, normalize } from 'vs/base/common/extpath'; import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform'; -import { isAbsolute, relative, posix, resolve, extname } from 'vs/base/common/paths.node'; +import { isAbsolute, relative, posix, resolve, extname } from 'vs/base/common/path'; import { normalizeDriveLetter } from 'vs/base/common/labels'; import { fsPath, dirname } from 'vs/base/common/resources'; import { Schemas } from 'vs/base/common/network'; diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts index fbd0ef1d6fb..aa5660586d4 100644 --- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts +++ b/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 'vs/base/common/paths.node'; +import { join, dirname } from 'vs/base/common/path'; import { mkdirp, writeFile, readFile } from 'vs/base/node/pfs'; import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs'; import { isLinux } from 'vs/base/common/platform'; diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts index f499cd3f2da..0c5e7f6f111 100644 --- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as extfs from 'vs/base/node/extfs'; import * as pfs from 'vs/base/node/pfs'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; diff --git a/src/vs/workbench/api/node/apiCommands.ts b/src/vs/workbench/api/node/apiCommands.ts index 5d38f70ae79..ab545da263a 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/paths.node'; +import { posix } from 'vs/base/common/path'; import * as vscode from 'vscode'; import { URI } from 'vs/base/common/uri'; import { isMalformedFileUri } from 'vs/base/common/resources'; diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 9d2adeee2e1..0e452f949fa 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { Barrier } from 'vs/base/common/async'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { TernarySearchTree } from 'vs/base/common/map'; diff --git a/src/vs/workbench/api/node/extHostOutputService.ts b/src/vs/workbench/api/node/extHostOutputService.ts index d37b7ea621b..378e541f990 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/paths.node'; +import { posix } 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'; diff --git a/src/vs/workbench/api/node/extHostSearch.fileIndex.ts b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts index 8f2e19af3fc..57ccbf500e8 100644 --- a/src/vs/workbench/api/node/extHostSearch.fileIndex.ts +++ b/src/vs/workbench/api/node/extHostSearch.fileIndex.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as arrays from 'vs/base/common/arrays'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 44588758e3b..cdd7cc85edb 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { URI, UriComponents } from 'vs/base/common/uri'; import * as Objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index dff25cdca69..c4869e6d60a 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as crypto from 'crypto'; -import { relative } from 'vs/base/common/paths.node'; +import { relative } from 'vs/base/common/path'; import { coalesce, equals } from 'vs/base/common/arrays'; import { illegalArgument } from 'vs/base/common/errors'; import { IRelativePattern } from 'vs/base/common/glob'; diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts index 45cad6f25e5..14adab0dd5f 100644 --- a/src/vs/workbench/api/node/extHostWorkspace.ts +++ b/src/vs/workbench/api/node/extHostWorkspace.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { join, relative } from 'vs/base/common/paths.node'; +import { join, relative } from 'vs/base/common/path'; import { delta as arrayDelta, mapArrayOrNot } from 'vs/base/common/arrays'; import { CancellationToken } from 'vs/base/common/cancellation'; import { Emitter, Event } from 'vs/base/common/event'; diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index b81bef70a48..51d70841bda 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/titlebarpart'; -import { dirname, posix } from 'vs/base/common/paths.node'; +import { dirname, posix } from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import { Part } from 'vs/workbench/browser/part'; import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService'; diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts index cca8dc7fc50..eb20c66bccf 100644 --- a/src/vs/workbench/common/editor/untitledEditorInput.ts +++ b/src/vs/workbench/common/editor/untitledEditorInput.ts @@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri'; import { suggestFilename } from 'vs/base/common/mime'; import { memoize } from 'vs/base/common/decorators'; import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry'; -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { basenameOrAuthority, dirname } from 'vs/base/common/resources'; import { EditorInput, IEncodingSupport, EncodingMode, ConfirmResult, Verbosity } from 'vs/workbench/common/editor'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts index d4fdf23470d..35059880637 100644 --- a/src/vs/workbench/common/resources.ts +++ b/src/vs/workbench/common/resources.ts @@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri'; import * as extpath from 'vs/base/common/extpath'; import * as objects from 'vs/base/common/objects'; import { Event, Emitter } from 'vs/base/common/event'; -import { relative } from 'vs/base/common/paths.node'; +import { relative } from 'vs/base/common/path'; import { basename, extname } from 'vs/base/common/resources'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IModeService } from 'vs/editor/common/services/modeService'; diff --git a/src/vs/workbench/contrib/cli/electron-browser/cli.contribution.ts b/src/vs/workbench/contrib/cli/electron-browser/cli.contribution.ts index 72284b13d9f..b0ac6293594 100644 --- a/src/vs/workbench/contrib/cli/electron-browser/cli.contribution.ts +++ b/src/vs/workbench/contrib/cli/electron-browser/cli.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as cp from 'child_process'; import * as pfs from 'vs/base/node/pfs'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts index 5af8216e351..17369ff0b6c 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { Disposable } from 'vs/base/common/lifecycle'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorExtensions'; diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts index be4545e5d25..1b6f41c628f 100644 --- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts +++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import strings = require('vs/base/common/strings'); -import { isAbsolute } from 'vs/base/common/paths.node'; +import { isAbsolute } from 'vs/base/common/path'; import { URI as uri } from 'vs/base/common/uri'; import { isMacintosh } from 'vs/base/common/platform'; import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent'; diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts index 17e710b3070..0eb47853e0f 100644 --- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts +++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet'; -import { normalize, isAbsolute, posix } from 'vs/base/common/paths.node'; +import { normalize, isAbsolute, posix } from 'vs/base/common/path'; import { IViewletPanelOptions, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts index 8e0c0c9130e..17452f05f78 100644 --- a/src/vs/workbench/contrib/debug/common/debugModel.ts +++ b/src/vs/workbench/contrib/debug/common/debugModel.ts @@ -20,7 +20,7 @@ import { } from 'vs/workbench/contrib/debug/common/debug'; import { Source } from 'vs/workbench/contrib/debug/common/debugSource'; import { commonSuffixLength } from 'vs/base/common/strings'; -import { posix } from 'vs/base/common/paths.node'; +import { posix } from 'vs/base/common/path'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/contrib/debug/common/debugSource.ts b/src/vs/workbench/contrib/debug/common/debugSource.ts index 4426c79b4b0..8efc84301ea 100644 --- a/src/vs/workbench/contrib/debug/common/debugSource.ts +++ b/src/vs/workbench/contrib/debug/common/debugSource.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import { URI as uri } from 'vs/base/common/uri'; -import { normalize, isAbsolute } from 'vs/base/common/paths.node'; +import { normalize, isAbsolute } from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import { DEBUG_SCHEME } from 'vs/workbench/contrib/debug/common/debug'; import { IRange } from 'vs/editor/common/core/range'; diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts index c7a13be11a1..c067fc8618a 100644 --- a/src/vs/workbench/contrib/debug/common/debugUtils.ts +++ b/src/vs/workbench/contrib/debug/common/debugUtils.ts @@ -6,7 +6,7 @@ import { equalsIgnoreCase } from 'vs/base/common/strings'; import { IConfig, IDebuggerContribution } from 'vs/workbench/contrib/debug/common/debug'; import { URI as uri } from 'vs/base/common/uri'; -import { isAbsolute } from 'vs/base/common/paths.node'; +import { isAbsolute } from 'vs/base/common/path'; import { deepClone } from 'vs/base/common/objects'; const _formatPIIRegexp = /{([^}]+)}/g; diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts index 78ecff9f0a1..7a5828acc53 100644 --- a/src/vs/workbench/contrib/debug/node/debugAdapter.ts +++ b/src/vs/workbench/contrib/debug/node/debugAdapter.ts @@ -8,7 +8,7 @@ import * as cp from 'child_process'; import * as stream from 'stream'; import * as nls from 'vs/nls'; import * as net from 'net'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as extpath from 'vs/base/common/extpath'; import * as strings from 'vs/base/common/strings'; import * as objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/contrib/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/contrib/execution/electron-browser/execution.contribution.ts index 5eca32359a2..b7993790f8c 100644 --- a/src/vs/workbench/contrib/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/contrib/execution/electron-browser/execution.contribution.ts @@ -8,7 +8,7 @@ import * as env from 'vs/base/common/platform'; import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import { URI as uri } from 'vs/base/common/uri'; import { ITerminalService } from 'vs/workbench/contrib/execution/common/execution'; import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; diff --git a/src/vs/workbench/contrib/execution/electron-browser/terminalService.ts b/src/vs/workbench/contrib/execution/electron-browser/terminalService.ts index f24e16be55d..0462e10ec86 100644 --- a/src/vs/workbench/contrib/execution/electron-browser/terminalService.ts +++ b/src/vs/workbench/contrib/execution/electron-browser/terminalService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as cp from 'child_process'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as processes from 'vs/base/node/processes'; import * as nls from 'vs/nls'; import { assign } from 'vs/base/common/objects'; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts index 8f585e9c68e..cd9c936d72e 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts @@ -11,7 +11,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { onUnexpectedError } from 'vs/base/common/errors'; import { tmpdir } from 'os'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { writeFile } from 'vs/base/node/pfs'; import { IExtensionHostProfileService, ReportExtensionIssueAction } from 'vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts index 9e11b8ccca7..3ba8fd0a77b 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -40,7 +40,7 @@ import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/cont import { IStorageService } from 'vs/platform/storage/common/storage'; import { ILabelService } from 'vs/platform/label/common/label'; import { renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel'; -import { join } from 'vs/base/common/paths.node'; +import { join } from 'vs/base/common/path'; import { onUnexpectedError } from 'vs/base/common/errors'; import { ExtensionIdentifier, ExtensionType } from 'vs/platform/extensions/common/extensions'; diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts index 8a52a7c829a..711e7e8a624 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import * as os from 'os'; import * as uuid from 'vs/base/common/uuid'; diff --git a/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts b/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts index 496fc625a89..611b3e46039 100644 --- a/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts +++ b/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts @@ -5,7 +5,7 @@ import { localize } from 'vs/nls'; import { memoize } from 'vs/base/common/decorators'; -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { basenameOrAuthority, dirname } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; import { EncodingMode, ConfirmResult, EditorInput, IFileEditorInput, ITextEditorModel, Verbosity, IRevertOptions } from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/contrib/files/common/explorerModel.ts b/src/vs/workbench/contrib/files/common/explorerModel.ts index e7b51eebadf..4ddf7073459 100644 --- a/src/vs/workbench/contrib/files/common/explorerModel.ts +++ b/src/vs/workbench/contrib/files/common/explorerModel.ts @@ -5,7 +5,7 @@ import { URI } from 'vs/base/common/uri'; import { isEqual } from 'vs/base/common/extpath'; -import { posix } from 'vs/base/common/paths.node'; +import { posix } from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import { ResourceMap } from 'vs/base/common/map'; import { isLinux } from 'vs/base/common/platform'; diff --git a/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts b/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts index 753a7016964..222927311e1 100644 --- a/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/contrib/files/electron-browser/files.contribution.ts @@ -6,7 +6,7 @@ import { URI } from 'vs/base/common/uri'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ShowViewletAction } from 'vs/workbench/browser/viewlet'; import * as nls from 'vs/nls'; -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; diff --git a/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts index 13b1dd6df83..79cd9b4378d 100644 --- a/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/contrib/files/electron-browser/views/explorerViewer.ts @@ -28,7 +28,7 @@ import { once } from 'vs/base/common/functional'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { normalize } from 'vs/base/common/extpath'; import { equals, deepClone } from 'vs/base/common/objects'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { ExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel'; import { compareFileExtensions, compareFileNames } from 'vs/base/common/comparers'; import { fillResourceDataTransfers, CodeDataTransfers, extractResources } from 'vs/workbench/browser/dnd'; diff --git a/src/vs/workbench/contrib/markers/electron-browser/markersPanel.ts b/src/vs/workbench/contrib/markers/electron-browser/markersPanel.ts index a78699224f9..c6490d59009 100644 --- a/src/vs/workbench/contrib/markers/electron-browser/markersPanel.ts +++ b/src/vs/workbench/contrib/markers/electron-browser/markersPanel.ts @@ -33,7 +33,7 @@ import { IExpression, getEmptyExpression } from 'vs/base/common/glob'; import { mixin, deepClone } from 'vs/base/common/objects'; import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { join } from 'vs/base/common/extpath'; -import { isAbsolute } from 'vs/base/common/paths.node'; +import { isAbsolute } from 'vs/base/common/path'; import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, TreeElement, MarkersTreeAccessibilityProvider, MarkersViewModel, ResourceDragAndDrop } from 'vs/workbench/contrib/markers/electron-browser/markersTreeViewer'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { Separator, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; diff --git a/src/vs/workbench/contrib/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/electron-browser/markersTreeViewer.ts index 9fb89f9d889..c301dbf47ff 100644 --- a/src/vs/workbench/contrib/markers/electron-browser/markersTreeViewer.ts +++ b/src/vs/workbench/contrib/markers/electron-browser/markersTreeViewer.ts @@ -5,7 +5,7 @@ import * as dom from 'vs/base/browser/dom'; import * as network from 'vs/base/common/network'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels'; import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel'; diff --git a/src/vs/workbench/contrib/output/browser/logViewer.ts b/src/vs/workbench/contrib/output/browser/logViewer.ts index 12bb9a1edea..a09231f1d15 100644 --- a/src/vs/workbench/contrib/output/browser/logViewer.ts +++ b/src/vs/workbench/contrib/output/browser/logViewer.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { dirname, basename } from 'vs/base/common/paths.node'; +import { dirname, basename } from 'vs/base/common/path'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/vs/workbench/contrib/output/electron-browser/outputServices.ts b/src/vs/workbench/contrib/output/electron-browser/outputServices.ts index 89d5b82cbc6..16964d3c117 100644 --- a/src/vs/workbench/contrib/output/electron-browser/outputServices.ts +++ b/src/vs/workbench/contrib/output/electron-browser/outputServices.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import * as extpath from 'vs/base/common/extpath'; -import { dirname } from 'vs/base/common/paths.node'; +import { dirname } from 'vs/base/common/path'; import * as strings from 'vs/base/common/strings'; import * as extfs from 'vs/base/node/extfs'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts b/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts index c32c245351d..968a1a5fc78 100644 --- a/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts +++ b/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { dirname, join, basename } from 'vs/base/common/paths.node'; +import { dirname, join, basename } from 'vs/base/common/path'; import { del, exists, readdir, readFile } from 'vs/base/node/pfs'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { localize } from 'vs/nls'; diff --git a/src/vs/workbench/contrib/search/browser/openFileHandler.ts b/src/vs/workbench/contrib/search/browser/openFileHandler.ts index 13dde49b8b1..5927620509f 100644 --- a/src/vs/workbench/contrib/search/browser/openFileHandler.ts +++ b/src/vs/workbench/contrib/search/browser/openFileHandler.ts @@ -5,7 +5,7 @@ import * as errors from 'vs/base/common/errors'; import * as nls from 'vs/nls'; -import { isAbsolute } from 'vs/base/common/paths.node'; +import { isAbsolute } from 'vs/base/common/path'; import * as objects from 'vs/base/common/objects'; import { defaultGenerator } from 'vs/base/common/idGenerator'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index fc203cdb7c8..c1caea124b3 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -5,7 +5,7 @@ import 'vs/css!./media/search.contribution'; -import { relative } from 'vs/base/common/paths.node'; +import { relative } from 'vs/base/common/path'; import { Action } from 'vs/base/common/actions'; import { distinct } from 'vs/base/common/arrays'; import { illegalArgument } from 'vs/base/common/errors'; diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts index db9031d025e..a148f512852 100644 --- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts +++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts @@ -11,7 +11,7 @@ import { IAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { ITreeNode, ITreeRenderer, ITreeDragAndDrop, ITreeDragOverReaction } from 'vs/base/browser/ui/tree/tree'; import { IAction } from 'vs/base/common/actions'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import * as nls from 'vs/nls'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/contrib/search/common/queryBuilder.ts b/src/vs/workbench/contrib/search/common/queryBuilder.ts index 6424ae7a1c2..66991d572a8 100644 --- a/src/vs/workbench/contrib/search/common/queryBuilder.ts +++ b/src/vs/workbench/contrib/search/common/queryBuilder.ts @@ -8,7 +8,7 @@ import * as collections from 'vs/base/common/collections'; import * as glob from 'vs/base/common/glob'; import { untildify } from 'vs/base/common/labels'; import { values } from 'vs/base/common/map'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { isEqual } from 'vs/base/common/resources'; import * as strings from 'vs/base/common/strings'; import { URI as uri } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts index 5a119517370..e2146dd406a 100644 --- a/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts +++ b/src/vs/workbench/contrib/snippets/browser/configureSnippets.ts @@ -9,7 +9,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { IModeService } from 'vs/editor/common/services/modeService'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { join } from 'vs/base/common/extpath'; -import { basename, dirname, extname } from 'vs/base/common/paths.node'; +import { basename, dirname, extname } from 'vs/base/common/path'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { timeout } from 'vs/base/common/async'; import { IOpenerService } from 'vs/platform/opener/common/opener'; diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts index 8983c7b36f8..7ae06dbb3ef 100644 --- a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts +++ b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts @@ -7,7 +7,7 @@ import { parse as jsonParse } from 'vs/base/common/json'; import { forEach } from 'vs/base/common/collections'; import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import { localize } from 'vs/nls'; -import { extname, basename } from 'vs/base/common/paths.node'; +import { extname, basename } from 'vs/base/common/path'; import { SnippetParser, Variable, Placeholder, Text } from 'vs/editor/contrib/snippet/snippetParser'; import { KnownSnippetVariableNames } from 'vs/editor/contrib/snippet/snippetVariables'; import { isFalsyOrWhitespace } from 'vs/base/common/strings'; diff --git a/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts index 9803f2a29bc..5732dfdca6e 100644 --- a/src/vs/workbench/contrib/tasks/electron-browser/terminalTaskSystem.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as nls from 'vs/nls'; import * as Objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts index 94f0f16fdbe..bf0faf95e77 100644 --- a/src/vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts index 0c4c4f97fd1..e4c9b02f123 100644 --- a/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts @@ -5,7 +5,7 @@ import { execFile } from 'child_process'; import * as os from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as browser from 'vs/base/browser/browser'; import * as dom from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler.ts index 8c0e75b110e..734d13fd45a 100644 --- a/src/vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalLinkHandler.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import * as pfs from 'vs/base/node/pfs'; import { URI as Uri } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/terminal/node/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/node/terminalEnvironment.ts index cc001f1e11d..18cd3308cf3 100644 --- a/src/vs/workbench/contrib/terminal/node/terminalEnvironment.ts +++ b/src/vs/workbench/contrib/terminal/node/terminalEnvironment.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as os from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import pkg from 'vs/platform/node/package'; import { URI as Uri } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts index 0ced31f3091..fdadec7eda5 100644 --- a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts +++ b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as os from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import * as pty from 'node-pty'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts index 1ae523588f5..99edaab4671 100644 --- a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as sinon from 'sinon'; class TestTerminalLinkHandler extends TerminalLinkHandler { diff --git a/src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts index 8f4f67eee2e..4f966189f0f 100644 --- a/src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts +++ b/src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; import { IModeService } from 'vs/editor/common/services/modeService'; import * as pfs from 'vs/base/node/pfs'; diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewProtocols.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewProtocols.ts index 0cf1568a53a..4aea4aa25a4 100644 --- a/src/vs/workbench/contrib/webview/electron-browser/webviewProtocols.ts +++ b/src/vs/workbench/contrib/webview/electron-browser/webviewProtocols.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { extname, sep } from 'vs/base/common/paths.node'; +import { extname, sep } from 'vs/base/common/path'; import { getMediaMime, MIME_UNKNOWN } from 'vs/base/common/mime'; import { startsWith } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/electron-browser/welcomePage.ts index 797d2deaf22..858efbf3ac0 100644 --- a/src/vs/workbench/contrib/welcome/page/electron-browser/welcomePage.ts +++ b/src/vs/workbench/contrib/welcome/page/electron-browser/welcomePage.ts @@ -6,7 +6,7 @@ import 'vs/css!./welcomePage'; import { URI } from 'vs/base/common/uri'; import * as strings from 'vs/base/common/strings'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { ICommandService } from 'vs/platform/commands/common/commands'; import * as arrays from 'vs/base/common/arrays'; import { WalkThroughInput } from 'vs/workbench/contrib/welcome/walkThrough/node/walkThroughInput'; diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index cc85d82487e..bb8d71438ef 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -43,7 +43,7 @@ import { MenubarChannelClient } from 'vs/platform/menubar/node/menubarIpc'; import { IMenubarService } from 'vs/platform/menubar/common/menubar'; import { Schemas } from 'vs/base/common/network'; import { sanitizeFilePath } from 'vs/base/node/extfs'; -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { createHash } from 'crypto'; import { IdleValue } from 'vs/base/common/async'; import { setGlobalLeakWarningThreshold } from 'vs/base/common/event'; diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts index 573956710b0..a089102b7f9 100644 --- a/src/vs/workbench/services/backup/node/backupFileService.ts +++ b/src/vs/workbench/services/backup/node/backupFileService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as crypto from 'crypto'; import * as pfs from 'vs/base/node/pfs'; import { URI as Uri } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts index b99cb06426c..e39ddee054b 100644 --- a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; 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'; diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts index f43fca5a475..f4af79b7afb 100644 --- a/src/vs/workbench/services/configuration/node/configuration.ts +++ b/src/vs/workbench/services/configuration/node/configuration.ts @@ -23,7 +23,7 @@ import * as extfs from 'vs/base/node/extfs'; import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService'; import { WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; -import { relative, extname } from 'vs/base/common/paths.node'; +import { relative, extname } from 'vs/base/common/path'; import { equals } from 'vs/base/common/objects'; import { Schemas } from 'vs/base/common/network'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts index 20a1ee587db..09fbb2c580b 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as fs from 'fs'; import * as json from 'vs/base/common/json'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts index 224049b67e7..d352600f53d 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as os from 'os'; import { URI } from 'vs/base/common/uri'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts index e4079c389b9..544988b7489 100644 --- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import * as types from 'vs/base/common/types'; import * as objects from 'vs/base/common/objects'; import { IStringDictionary } from 'vs/base/common/collections'; diff --git a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts index 4dbb0df032e..bc87d6f020f 100644 --- a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts +++ b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import * as os from 'os'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import * as errors from 'vs/base/common/errors'; import { Schemas } from 'vs/base/common/network'; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index dd577074d35..a6d06e2e448 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { isNonEmptyArray } from 'vs/base/common/arrays'; import { Barrier, runWhenIdle } from 'vs/base/common/async'; import { Emitter, Event } from 'vs/base/common/event'; diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts index cc7f423071c..e2b2719a810 100644 --- a/src/vs/workbench/services/extensions/node/extensionPoints.ts +++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as semver from 'semver'; import * as json from 'vs/base/common/json'; import * as arrays from 'vs/base/common/arrays'; diff --git a/src/vs/workbench/services/files/electron-browser/encoding.ts b/src/vs/workbench/services/files/electron-browser/encoding.ts index 1ba1fe13e7d..b600d76c684 100644 --- a/src/vs/workbench/services/files/electron-browser/encoding.ts +++ b/src/vs/workbench/services/files/electron-browser/encoding.ts @@ -8,7 +8,7 @@ import * as encoding from 'vs/base/node/encoding'; import { URI as uri } from 'vs/base/common/uri'; import { IResolveContentOptions, isParent, IResourceEncodings } from 'vs/platform/files/common/files'; import { isLinux } from 'vs/base/common/platform'; -import { extname } from 'vs/base/common/paths.node'; +import { extname } from 'vs/base/common/path'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts index cf44ce508b3..51c43e4e891 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/electron-browser/fileService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as paths from 'vs/base/common/paths.node'; +import * as paths from 'vs/base/common/path'; import * as fs from 'fs'; import * as os from 'os'; import * as crypto from 'crypto'; diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts index 48b8b5620c7..9ba4518f60b 100644 --- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts @@ -5,7 +5,7 @@ import * as glob from 'vs/base/common/glob'; import * as extpath from 'vs/base/common/extpath'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as platform from 'vs/base/common/platform'; import * as watcher from 'vs/workbench/services/files/node/watcher/common'; import * as nsfw from 'vscode-nsfw'; diff --git a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts b/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts index 615bc6e18b0..cf2ad1c1d98 100644 --- a/src/vs/workbench/services/files/node/watcher/unix/test/chockidarWatcherService.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as pfs from 'vs/base/node/pfs'; import { normalizeRoots, ChokidarWatcherService } from '../chokidarWatcherService'; diff --git a/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts index f44a4162e9e..1b07376f34c 100644 --- a/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/win32/watcherService.ts @@ -7,7 +7,7 @@ import { IRawFileChange, toFileChangesEvent } from 'vs/workbench/services/files/ import { OutOfProcessWin32FolderWatcher } from 'vs/workbench/services/files/node/watcher/win32/csharpWatcherService'; import { FileChangesEvent } from 'vs/platform/files/common/files'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { normalize, posix } from 'vs/base/common/paths.node'; +import { normalize, posix } from 'vs/base/common/path'; import { rtrim, endsWith } from 'vs/base/common/strings'; import { Schemas } from 'vs/base/common/network'; diff --git a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts index 8ee8dc2db75..c36d6a01d34 100644 --- a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts +++ b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as os from 'os'; import * as assert from 'assert'; import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; diff --git a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts index 1bc826fa73f..57f7692827f 100644 --- a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts +++ b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as fs from 'fs'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as assert from 'assert'; import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileService'; diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts index 6794d52fe0a..fff915d793e 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as json from 'vs/base/common/json'; import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes'; import { OS } from 'vs/base/common/platform'; diff --git a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts index 1ef65f0bb74..8867dda515c 100644 --- a/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts +++ b/src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes'; import { ScanCodeBinding } from 'vs/base/common/scanCode'; diff --git a/src/vs/workbench/services/label/test/label.test.ts b/src/vs/workbench/services/label/test/label.test.ts index 741cbc8d683..f8abf19df41 100644 --- a/src/vs/workbench/services/label/test/label.test.ts +++ b/src/vs/workbench/services/label/test/label.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { TestEnvironmentService, TestContextService, TestWindowService } from 'vs/workbench/test/workbenchTestServices'; import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace'; import { URI } from 'vs/base/common/uri'; -import { sep } from 'vs/base/common/paths.node'; +import { sep } from 'vs/base/common/path'; import { isWindows } from 'vs/base/common/platform'; import { LabelService } from 'vs/workbench/services/label/common/labelService'; diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts index 7d5250396e8..9d4553aa00e 100644 --- a/src/vs/workbench/services/search/node/fileSearch.ts +++ b/src/vs/workbench/services/search/node/fileSearch.ts @@ -5,7 +5,7 @@ import * as childProcess from 'child_process'; import * as fs from 'fs'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { Readable } from 'stream'; import { NodeStringDecoder, StringDecoder } from 'string_decoder'; import * as arrays from 'vs/base/common/arrays'; diff --git a/src/vs/workbench/services/search/node/fileSearchManager.ts b/src/vs/workbench/services/search/node/fileSearchManager.ts index bec5dcc2497..6ffabf94a20 100644 --- a/src/vs/workbench/services/search/node/fileSearchManager.ts +++ b/src/vs/workbench/services/search/node/fileSearchManager.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import * as glob from 'vs/base/common/glob'; diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts index f872a93a11e..436fc42af4f 100644 --- a/src/vs/workbench/services/search/node/rawSearchService.ts +++ b/src/vs/workbench/services/search/node/rawSearchService.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as gracefulFs from 'graceful-fs'; -import { join, sep } from 'vs/base/common/paths.node'; +import { join, sep } from 'vs/base/common/path'; import * as arrays from 'vs/base/common/arrays'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts index 02506495d0f..44821d950ec 100644 --- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as cp from 'child_process'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import * as glob from 'vs/base/common/glob'; import { normalizeNFD } from 'vs/base/common/normalization'; import * as objects from 'vs/base/common/objects'; diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts index 3eed6f65dc0..f201ae9dc01 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts @@ -5,7 +5,7 @@ import * as cp from 'child_process'; import { EventEmitter } from 'events'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { NodeStringDecoder, StringDecoder } from 'string_decoder'; import { createRegExp, startsWith, startsWithUTF8BOM, stripUTF8BOM, escapeRegExpCharacters, endsWith } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/services/search/node/textSearchManager.ts b/src/vs/workbench/services/search/node/textSearchManager.ts index 172aa06d15e..9f2dd2b0c88 100644 --- a/src/vs/workbench/services/search/node/textSearchManager.ts +++ b/src/vs/workbench/services/search/node/textSearchManager.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { mapArrayOrNot } from 'vs/base/common/arrays'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { toErrorMessage } from 'vs/base/common/errorMessage'; diff --git a/src/vs/workbench/services/search/test/node/rawSearchService.test.ts b/src/vs/workbench/services/search/test/node/rawSearchService.test.ts index 793347694ac..7c156c5e583 100644 --- a/src/vs/workbench/services/search/test/node/rawSearchService.test.ts +++ b/src/vs/workbench/services/search/test/node/rawSearchService.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { Emitter, Event } from 'vs/base/common/event'; diff --git a/src/vs/workbench/services/search/test/node/search.test.ts b/src/vs/workbench/services/search/test/node/search.test.ts index 61fa1dddf07..54a0b987170 100644 --- a/src/vs/workbench/services/search/test/node/search.test.ts +++ b/src/vs/workbench/services/search/test/node/search.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import { join, normalize } from 'vs/base/common/extpath'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts index a8b3a16f2b9..02d457aaadd 100644 --- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts +++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as path from 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { getPathFromAmdModule } from 'vs/base/common/amd'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import * as glob from 'vs/base/common/glob'; diff --git a/src/vs/workbench/services/themes/common/fileIconThemeData.ts b/src/vs/workbench/services/themes/common/fileIconThemeData.ts index 2e84a45328e..8b345ada938 100644 --- a/src/vs/workbench/services/themes/common/fileIconThemeData.ts +++ b/src/vs/workbench/services/themes/common/fileIconThemeData.ts @@ -5,7 +5,7 @@ import { URI } from 'vs/base/common/uri'; import * as nls from 'vs/nls'; -import * as Paths from 'vs/base/common/paths.node'; +import * as Paths from 'vs/base/common/path'; import * as resources from 'vs/base/common/resources'; import * as Json from 'vs/base/common/json'; import { ExtensionData, IThemeExtensionPoint, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts index f269db76bbc..ce532cb064d 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as Extpath from 'vs/base/common/extpath'; -import { basename } from 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import * as Json from 'vs/base/common/json'; import { Color } from 'vs/base/common/color'; import { ExtensionData, ITokenColorCustomizations, ITokenColorizationRule, IColorTheme, IColorMap, IThemeExtensionPoint, VS_LIGHT_THEME, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts index ac14865e696..fc8004f72b8 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostWorkspace.test.ts +++ b/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 'vs/base/common/paths.node'; +import { basename } from 'vs/base/common/path'; import { ExtHostWorkspaceProvider } from 'vs/workbench/api/node/extHostWorkspace'; import { TestRPCProtocol } from './testRPCProtocol'; import { normalize } from 'vs/base/common/extpath'; diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts index 8d6e468412a..1376b5e4a47 100644 --- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; import { CancellationToken } from 'vs/base/common/cancellation'; import { URI } from 'vs/base/common/uri'; import { IModelService } from 'vs/editor/common/services/modelService'; diff --git a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts index 1853dd074c6..cd61bc45126 100644 --- a/src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts +++ b/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 'vs/base/common/paths.node'; +import * as path from 'vs/base/common/path'; 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';