diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts index 8f11810ba62..d74f249a405 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -52,7 +52,7 @@ export namespace Schemas { export const vscodeRemoteResource = 'vscode-remote-resource'; - export const userData = 'vscode-userdata'; + export const vscodeUserData = 'vscode-userdata'; export const vscodeCustomEditor = 'vscode-custom-editor'; diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index a6f7c2a618e..4ceca86eead 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -214,10 +214,10 @@ class SharedProcessMain extends Disposable { // Since user data can change very frequently across multiple // processes, we want a single process handling these operations. this._register(new DiskFileSystemProviderClient(mainProcessService.getChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME), { pathCaseSensitive: isLinux })), - Schemas.userData, + Schemas.vscodeUserData, logService )); - fileService.registerProvider(Schemas.userData, userDataFileSystemProvider); + fileService.registerProvider(Schemas.vscodeUserData, userDataFileSystemProvider); // Configuration const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService)); diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts index b9772cfd08d..edd0a1f1394 100644 --- a/src/vs/editor/common/services/modelService.ts +++ b/src/vs/editor/common/services/modelService.ts @@ -567,7 +567,7 @@ export class ModelService extends Disposable implements IModelService { return ( resource.scheme === Schemas.file || resource.scheme === Schemas.vscodeRemote - || resource.scheme === Schemas.userData + || resource.scheme === Schemas.vscodeUserData || resource.scheme === Schemas.vscodeNotebookCell || resource.scheme === 'fake-fs' // for tests ); diff --git a/src/vs/platform/files/test/browser/indexedDBFileService.test.ts b/src/vs/platform/files/test/browser/indexedDBFileService.test.ts index ec314be1b61..3387e3b989b 100644 --- a/src/vs/platform/files/test/browser/indexedDBFileService.test.ts +++ b/src/vs/platform/files/test/browser/indexedDBFileService.test.ts @@ -26,7 +26,7 @@ flakySuite('IndexedDBFileSystemProvider', function () { const testDir = '/'; const logfileURIFromPaths = (paths: string[]) => joinPath(URI.from({ scheme: logSchema, path: testDir }), ...paths); - const userdataURIFromPaths = (paths: readonly string[]) => joinPath(URI.from({ scheme: Schemas.userData, path: testDir }), ...paths); + const userdataURIFromPaths = (paths: readonly string[]) => joinPath(URI.from({ scheme: Schemas.vscodeUserData, path: testDir }), ...paths); const disposables = new DisposableStore(); @@ -73,8 +73,8 @@ flakySuite('IndexedDBFileSystemProvider', function () { disposables.add(service.registerProvider(logSchema, logFileProvider)); disposables.add(logFileProvider); - userdataFileProvider = new IndexedDBFileSystemProvider(Schemas.userData, indexedDB, 'vscode-userdata-store', true); - disposables.add(service.registerProvider(Schemas.userData, userdataFileProvider)); + userdataFileProvider = new IndexedDBFileSystemProvider(Schemas.vscodeUserData, indexedDB, 'vscode-userdata-store', true); + disposables.add(service.registerProvider(Schemas.vscodeUserData, userdataFileProvider)); disposables.add(userdataFileProvider); }; diff --git a/src/vs/platform/sharedProcess/node/sharedProcessEnvironmentService.ts b/src/vs/platform/sharedProcess/node/sharedProcessEnvironmentService.ts index ecf3f1d6aac..7cb9f0d402f 100644 --- a/src/vs/platform/sharedProcess/node/sharedProcessEnvironmentService.ts +++ b/src/vs/platform/sharedProcess/node/sharedProcessEnvironmentService.ts @@ -11,6 +11,6 @@ import { NativeEnvironmentService } from 'vs/platform/environment/node/environme export class SharedProcessEnvironmentService extends NativeEnvironmentService { @memoize - override get userRoamingDataHome(): URI { return this.appSettingsHome.with({ scheme: Schemas.userData }); } + override get userRoamingDataHome(): URI { return this.appSettingsHome.with({ scheme: Schemas.vscodeUserData }); } } diff --git a/src/vs/platform/storage/test/browser/storageService.test.ts b/src/vs/platform/storage/test/browser/storageService.test.ts index 2b1ed5b22e6..cf51c013ef8 100644 --- a/src/vs/platform/storage/test/browser/storageService.test.ts +++ b/src/vs/platform/storage/test/browser/storageService.test.ts @@ -23,7 +23,7 @@ async function createStorageService(): Promise<[DisposableStore, BrowserStorageS const fileService = disposables.add(new FileService(logService)); const userDataProvider = disposables.add(new InMemoryFileSystemProvider()); - disposables.add(fileService.registerProvider(Schemas.userData, userDataProvider)); + disposables.add(fileService.registerProvider(Schemas.vscodeUserData, userDataProvider)); const storageService = disposables.add(new BrowserStorageService({ id: 'workspace-storage-test' }, logService)); diff --git a/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts b/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts index 775fd04c1d3..8e2852d182d 100644 --- a/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts +++ b/src/vs/platform/userData/test/browser/fileUserDataProvider.test.ts @@ -25,7 +25,7 @@ class TestEnvironmentService extends AbstractNativeEnvironmentService { constructor(private readonly _appSettingsHome: URI) { super(Object.create(null), Object.create(null), { _serviceBrand: undefined, ...product }); } - override get userRoamingDataHome() { return this._appSettingsHome.with({ scheme: Schemas.userData }); } + override get userRoamingDataHome() { return this._appSettingsHome.with({ scheme: Schemas.vscodeUserData }); } } suite('FileUserDataProvider', () => { @@ -51,9 +51,9 @@ suite('FileUserDataProvider', () => { environmentService = new TestEnvironmentService(userDataHomeOnDisk); - fileUserDataProvider = new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, logService); + fileUserDataProvider = new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, logService); disposables.add(fileUserDataProvider); - disposables.add(testObject.registerProvider(Schemas.userData, fileUserDataProvider)); + disposables.add(testObject.registerProvider(Schemas.vscodeUserData, fileUserDataProvider)); }); teardown(() => disposables.clear()); @@ -304,13 +304,13 @@ suite('FileUserDataProvider - Watching', () => { let testObject: FileUserDataProvider; const disposables = new DisposableStore(); const rootFileResource = joinPath(ROOT, 'User'); - const rootUserDataResource = rootFileResource.with({ scheme: Schemas.userData }); + const rootUserDataResource = rootFileResource.with({ scheme: Schemas.vscodeUserData }); const fileEventEmitter: Emitter = new Emitter(); disposables.add(fileEventEmitter); setup(() => { - testObject = disposables.add(new FileUserDataProvider(rootFileResource.scheme, new TestFileSystemProvider(fileEventEmitter.event), Schemas.userData, new NullLogService())); + testObject = disposables.add(new FileUserDataProvider(rootFileResource.scheme, new TestFileSystemProvider(fileEventEmitter.event), Schemas.vscodeUserData, new NullLogService())); }); teardown(() => disposables.clear()); diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts index c43ca682255..9867e2a5e6b 100644 --- a/src/vs/workbench/api/node/extHostSearch.ts +++ b/src/vs/workbench/api/node/extHostSearch.ts @@ -38,7 +38,7 @@ export class NativeExtHostSearch extends ExtHostSearch { super(extHostRpc, _uriTransformer, _logService); const outputChannel = new OutputChannel('RipgrepSearchUD', this._logService); - this.registerTextSearchProvider(Schemas.userData, new RipgrepSearchProvider(outputChannel)); + this.registerTextSearchProvider(Schemas.vscodeUserData, new RipgrepSearchProvider(outputChannel)); if (initData.remote.isRemote && initData.remote.authority) { this._registerEHSearchProviders(); } diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index 5cfebbd665b..260d8438a27 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -330,7 +330,7 @@ export class BrowserMain extends Disposable { logService.info('Using in-memory user data provider'); userDataProvider = new InMemoryFileSystemProvider(); } - fileService.registerProvider(Schemas.userData, userDataProvider); + fileService.registerProvider(Schemas.vscodeUserData, userDataProvider); // Remote file system this._register(RemoteFileSystemProviderClient.register(remoteAgentService, fileService, logService)); @@ -406,7 +406,7 @@ export class BrowserMain extends Disposable { } private async createWorkspaceService(payload: IAnyWorkspaceIdentifier, environmentService: IWorkbenchEnvironmentService, fileService: FileService, remoteAgentService: IRemoteAgentService, uriIdentityService: IUriIdentityService, logService: ILogService): Promise { - const configurationCache = new ConfigurationCache([Schemas.file, Schemas.userData, Schemas.tmp] /* Cache all non native resources */, environmentService, fileService); + const configurationCache = new ConfigurationCache([Schemas.file, Schemas.vscodeUserData, Schemas.tmp] /* Cache all non native resources */, environmentService, fileService); const workspaceService = new WorkspaceService({ remoteAuthority: this.configuration.remoteAuthority, configurationCache }, environmentService, fileService, remoteAgentService, uriIdentityService, logService); try { diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts index d4a40dba3df..cbcbac8602c 100644 --- a/src/vs/workbench/browser/window.ts +++ b/src/vs/workbench/browser/window.ts @@ -195,7 +195,7 @@ export class BrowserWindow extends Disposable { private registerLabelFormatters() { this._register(this.labelService.registerFormatter({ - scheme: Schemas.userData, + scheme: Schemas.vscodeUserData, priority: true, formatting: { label: '(Settings) ${path}', diff --git a/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts b/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts index a6419b54864..630cd3a523a 100644 --- a/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts +++ b/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts @@ -176,7 +176,7 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements private allowLabelOverride(): boolean { return this.resource.scheme !== this.pathService.defaultUriScheme && - this.resource.scheme !== Schemas.userData && + this.resource.scheme !== Schemas.vscodeUserData && this.resource.scheme !== Schemas.file && this.resource.scheme !== Schemas.vscodeRemote; } diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts b/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts index a7d49c574cb..7e5450675c1 100644 --- a/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts +++ b/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts @@ -25,7 +25,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; const REVEAL_IN_OS_COMMAND_ID = 'revealFileInOS'; const REVEAL_IN_OS_LABEL = isWindows ? nls.localize('revealInWindows', "Reveal in File Explorer") : isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder"); -const REVEAL_IN_OS_WHEN_CONTEXT = ContextKeyExpr.or(ResourceContextKey.Scheme.isEqualTo(Schemas.file), ResourceContextKey.Scheme.isEqualTo(Schemas.userData)); +const REVEAL_IN_OS_WHEN_CONTEXT = ContextKeyExpr.or(ResourceContextKey.Scheme.isEqualTo(Schemas.file), ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData)); KeybindingsRegistry.registerCommandAndKeybindingRule({ id: REVEAL_IN_OS_COMMAND_ID, diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts index c0618077d00..b6afa32e4ef 100644 --- a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts +++ b/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts @@ -14,7 +14,7 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native'; export function revealResourcesInOS(resources: URI[], nativeHostService: INativeHostService, workspaceContextService: IWorkspaceContextService): void { if (resources.length) { sequence(resources.map(r => async () => { - if (r.scheme === Schemas.file || r.scheme === Schemas.userData) { + if (r.scheme === Schemas.file || r.scheme === Schemas.vscodeUserData) { nativeHostService.showItemInFolder(r.fsPath); } })); diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts b/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts index effbb9e71bc..1d666fb5cc4 100644 --- a/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts +++ b/src/vs/workbench/contrib/localHistory/browser/localHistoryTimeline.ts @@ -23,6 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { COMPARE_WITH_FILE_LABEL, toDiffEditorArguments } from 'vs/workbench/contrib/localHistory/browser/localHistoryCommands'; import { MarkdownString } from 'vs/base/common/htmlContent'; import { LOCAL_HISTORY_DATE_FORMATTER, LOCAL_HISTORY_MENU_CONTEXT_VALUE } from 'vs/workbench/contrib/localHistory/browser/localHistory'; +import { Schemas } from 'vs/base/common/network'; export class LocalHistoryTimeline extends Disposable implements IWorkbenchContribution, TimelineProvider { @@ -108,12 +109,12 @@ export class LocalHistoryTimeline extends Disposable implements IWorkbenchContri // Try to convert the provided `uri` into a form that is likely // for the provider to find entries for: // - `vscode-local-history`: convert back to the associated resource - // - default-scheme: keep as is + // - default-scheme / settings: keep as is // - anything that is backed by a file system provider: convert let resource: URI | undefined = undefined; if (uri.scheme === LocalHistoryFileSystemProvider.SCHEMA) { resource = LocalHistoryFileSystemProvider.fromLocalHistoryFileSystem(uri).associatedResource; - } else if (uri.scheme === this.pathService.defaultUriScheme) { + } else if (uri.scheme === this.pathService.defaultUriScheme || uri.scheme === Schemas.vscodeUserData) { resource = uri; } else if (this.fileService.hasProvider(uri)) { resource = URI.from({ scheme: this.pathService.defaultUriScheme, authority: this.environmentService.remoteAuthority, path: uri.path }); diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts index 7ba5f021196..894ccb8be73 100644 --- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts +++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts @@ -54,7 +54,7 @@ export class LabelContribution implements IWorkbenchContribution { if (remoteEnvironment) { this.labelService.registerFormatter({ - scheme: Schemas.userData, + scheme: Schemas.vscodeUserData, formatting }); } diff --git a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts index 524a3903b0f..e8c7da68932 100644 --- a/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts +++ b/src/vs/workbench/contrib/terminal/common/remoteTerminalChannel.ts @@ -163,7 +163,7 @@ export class RemoteTerminalChannelClient implements IPtyHostController { const activeFileResource = EditorResourceAccessor.getOriginalUri(this._editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, - filterByScheme: [Schemas.file, Schemas.userData, Schemas.vscodeRemote] + filterByScheme: [Schemas.file, Schemas.vscodeUserData, Schemas.vscodeRemote] }); const args: ICreateTerminalProcessArguments = { diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts index ad465887438..e4c63f35ce9 100644 --- a/src/vs/workbench/electron-sandbox/desktop.main.ts +++ b/src/vs/workbench/electron-sandbox/desktop.main.ts @@ -229,7 +229,7 @@ export class DesktopMain extends Disposable { this._register(RemoteFileSystemProviderClient.register(remoteAgentService, fileService, logService)); // User Data Provider - fileService.registerProvider(Schemas.userData, this._register(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.userData, logService))); + fileService.registerProvider(Schemas.vscodeUserData, this._register(new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.vscodeUserData, logService))); // URI Identity const uriIdentityService = new UriIdentityService(fileService); @@ -331,7 +331,7 @@ export class DesktopMain extends Disposable { } private async createWorkspaceService(payload: IAnyWorkspaceIdentifier, environmentService: INativeWorkbenchEnvironmentService, fileService: FileService, remoteAgentService: IRemoteAgentService, uriIdentityService: IUriIdentityService, logService: ILogService): Promise { - const configurationCache = new ConfigurationCache([Schemas.file, Schemas.userData] /* Cache all non native resources */, environmentService, fileService); + const configurationCache = new ConfigurationCache([Schemas.file, Schemas.vscodeUserData] /* Cache all non native resources */, environmentService, fileService); const workspaceService = new WorkspaceService({ remoteAuthority: environmentService.remoteAuthority, configurationCache }, environmentService, fileService, remoteAgentService, uriIdentityService, logService); try { diff --git a/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts index 86b58fd04d2..7d7e3cb1267 100644 --- a/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts +++ b/src/vs/workbench/services/configuration/test/browser/configurationEditingService.test.ts @@ -94,7 +94,7 @@ suite('ConfigurationEditingService', () => { environmentService = TestEnvironmentService; instantiationService.stub(IEnvironmentService, environmentService); const remoteAgentService = disposables.add(instantiationService.createInstance(RemoteAgentService, null)); - disposables.add(fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, logService)))); + disposables.add(fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, logService)))); instantiationService.stub(IFileService, fileService); instantiationService.stub(IRemoteAgentService, remoteAgentService); workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); diff --git a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts index 773453dc5d4..61cc2fc1b51 100644 --- a/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts +++ b/src/vs/workbench/services/configuration/test/browser/configurationService.test.ts @@ -76,7 +76,7 @@ suite('WorkspaceContextService - Folder', () => { await fileService.createFolder(folder); const environmentService = TestEnvironmentService; - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, new RemoteAgentService(null, environmentService, TestProductService, new RemoteAuthorityResolverService(undefined, undefined), new SignService(undefined), new NullLogService()), new UriIdentityService(fileService), new NullLogService())); await (testObject).initialize(convertToWorkspacePayload(folder)); }); @@ -142,7 +142,7 @@ suite('WorkspaceContextService - Workspace', () => { const environmentService = TestEnvironmentService; const remoteAgentService = disposables.add(instantiationService.createInstance(RemoteAgentService, null)); instantiationService.stub(IRemoteAgentService, remoteAgentService); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IWorkspaceContextService, testObject); @@ -200,7 +200,7 @@ suite('WorkspaceContextService - Workspace Editing', () => { const environmentService = TestEnvironmentService; const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null); instantiationService.stub(IRemoteAgentService, remoteAgentService); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IFileService, fileService); @@ -443,7 +443,7 @@ suite('WorkspaceService - Initialization', () => { environmentService = TestEnvironmentService; const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null); instantiationService.stub(IRemoteAgentService, remoteAgentService); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IFileService, fileService); instantiationService.stub(IWorkspaceContextService, testObject); @@ -692,7 +692,7 @@ suite('WorkspaceConfigurationService - Folder', () => { environmentService = TestEnvironmentService; const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null); instantiationService.stub(IRemoteAgentService, remoteAgentService); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); workspaceService = testObject = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IFileService, fileService); instantiationService.stub(IWorkspaceContextService, testObject); @@ -1363,7 +1363,7 @@ suite('WorkspaceConfigurationService-Multiroot', () => { environmentService = TestEnvironmentService; const remoteAgentService = instantiationService.createInstance(RemoteAgentService, null); instantiationService.stub(IRemoteAgentService, remoteAgentService); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); const workspaceService = disposables.add(new WorkspaceService({ configurationCache: new ConfigurationCache() }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IFileService, fileService); @@ -2023,7 +2023,7 @@ suite('WorkspaceConfigurationService - Remote Folder', () => { environmentService = TestEnvironmentService; const remoteEnvironmentPromise = new Promise>(c => resolveRemoteEnvironment = () => c({ settingsPath: remoteSettingsResource })); const remoteAgentService = instantiationService.stub(IRemoteAgentService, >{ getEnvironment: () => remoteEnvironmentPromise }); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); const configurationCache: IConfigurationCache = { read: () => Promise.resolve(''), write: () => Promise.resolve(), remove: () => Promise.resolve(), needsCaching: () => false }; testObject = disposables.add(new WorkspaceService({ configurationCache, remoteAuthority }, environmentService, fileService, remoteAgentService, new UriIdentityService(fileService), new NullLogService())); instantiationService.stub(IWorkspaceContextService, testObject); diff --git a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts index 194e7a93d36..acbac82cf51 100644 --- a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts @@ -59,7 +59,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR getFilePath: (): string | undefined => { const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, - filterByScheme: [Schemas.file, Schemas.userData, this.pathService.defaultUriScheme] + filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme] }); if (!fileResource) { return undefined; @@ -69,7 +69,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR getWorkspaceFolderPathForFile: (): string | undefined => { const fileResource = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, - filterByScheme: [Schemas.file, Schemas.userData, this.pathService.defaultUriScheme] + filterByScheme: [Schemas.file, Schemas.vscodeUserData, this.pathService.defaultUriScheme] }); if (!fileResource) { return undefined; diff --git a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts index e84dc0dd366..cbb7a21bcba 100644 --- a/src/vs/workbench/services/dialogs/browser/fileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/fileDialogService.ts @@ -274,7 +274,7 @@ export class FileDialogService extends AbstractFileDialogService implements IFil } private shouldUseSimplified(scheme: string): boolean { - return ![Schemas.file, Schemas.userData, Schemas.tmp].includes(scheme); + return ![Schemas.file, Schemas.vscodeUserData, Schemas.tmp].includes(scheme); } } diff --git a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts index ef2ac0fca5f..e4468a73200 100644 --- a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts +++ b/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts @@ -63,7 +63,7 @@ export class FileDialogService extends AbstractFileDialogService implements IFil const setting = (this.configurationService.getValue('files.simpleDialog.enable') === true); const newWindowSetting = (this.configurationService.getValue('window.openFilesInNewWindow') === 'on'); return { - useSimplified: ((schema !== Schemas.file) && (schema !== Schemas.userData)) || setting, + useSimplified: ((schema !== Schemas.file) && (schema !== Schemas.vscodeUserData)) || setting, isSetting: newWindowSetting }; } diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index bf1eedb1c01..0028c843a15 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -52,7 +52,7 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi get logFile(): URI { return joinPath(this.logsHome, 'window.log'); } @memoize - get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.userData }); } + get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); } @memoize get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); } diff --git a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts index 091a6452a1b..ab7626e36cb 100644 --- a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts +++ b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts @@ -82,7 +82,7 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment } @memoize - override get userRoamingDataHome(): URI { return this.appSettingsHome.with({ scheme: Schemas.userData }); } + override get userRoamingDataHome(): URI { return this.appSettingsHome.with({ scheme: Schemas.vscodeUserData }); } @memoize get logFile(): URI { return URI.file(join(this.logsPath, `renderer${this.configuration.windowId}.log`)); } diff --git a/src/vs/workbench/services/history/browser/historyService.ts b/src/vs/workbench/services/history/browser/historyService.ts index d872c2fd669..d66156b3251 100644 --- a/src/vs/workbench/services/history/browser/historyService.ts +++ b/src/vs/workbench/services/history/browser/historyService.ts @@ -1899,7 +1899,7 @@ class EditorHelper { const hasValidResourceEditorInputScheme = resource?.scheme === Schemas.file || resource?.scheme === Schemas.vscodeRemote || - resource?.scheme === Schemas.userData || + resource?.scheme === Schemas.vscodeUserData || resource?.scheme === this.pathService.defaultUriScheme; // Scheme is valid: prefer the untyped input diff --git a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts index ba84b6b152b..00076bb9cc3 100644 --- a/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts +++ b/src/vs/workbench/services/keybinding/test/browser/keybindingEditing.test.ts @@ -114,7 +114,7 @@ suite('KeybindingsEditing', () => { instantiationService.stub(IThemeService, new TestThemeService()); instantiationService.stub(ILanguageConfigurationService, new TestLanguageConfigurationService()); instantiationService.stub(IModelService, disposables.add(instantiationService.createInstance(ModelService))); - fileService.registerProvider(Schemas.userData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.userData, new NullLogService()))); + fileService.registerProvider(Schemas.vscodeUserData, disposables.add(new FileUserDataProvider(ROOT.scheme, fileSystemProvider, Schemas.vscodeUserData, new NullLogService()))); instantiationService.stub(IFileService, fileService); instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService)); instantiationService.stub(IWorkingCopyFileService, disposables.add(instantiationService.createInstance(WorkingCopyFileService))); diff --git a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts index 7fdbc01fc50..56430c94287 100644 --- a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts +++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts @@ -19,7 +19,7 @@ export class RipgrepSearchProvider implements TextSearchProvider { provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress, token: CancellationToken): Promise { const engine = new RipgrepTextSearchEngine(this.outputChannel); - if (options.folder.scheme === Schemas.userData) { + if (options.folder.scheme === Schemas.vscodeUserData) { // Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend, // case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme. const translatedOptions = { ...options, folder: options.folder.with({ scheme: Schemas.file }) }; diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts index 169611a40ef..263c21cae1f 100644 --- a/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts +++ b/src/vs/workbench/services/workingCopy/common/workingCopyHistoryTracker.ts @@ -140,7 +140,7 @@ export class WorkingCopyHistoryTracker extends Disposable implements IWorkbenchC private shouldTrackHistory(e: IWorkingCopySaveEvent): e is IStoredFileWorkingCopySaveEvent { if ( e.workingCopy.resource.scheme !== this.pathService.defaultUriScheme && // track history for all workspace resources - e.workingCopy.resource.scheme !== Schemas.userData // track history for all settings + e.workingCopy.resource.scheme !== Schemas.vscodeUserData // track history for all settings ) { return false; // do not support unknown resources } diff --git a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts index fa7709542c9..a0c22c68010 100644 --- a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts +++ b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts @@ -61,7 +61,7 @@ export class NodeTestWorkingCopyBackupService extends NativeWorkingCopyBackupSer this.diskFileSystemProvider = new DiskFileSystemProvider(logService); fileService.registerProvider(Schemas.file, this.diskFileSystemProvider); - fileService.registerProvider(Schemas.userData, new FileUserDataProvider(Schemas.file, this.diskFileSystemProvider, Schemas.userData, logService)); + fileService.registerProvider(Schemas.vscodeUserData, new FileUserDataProvider(Schemas.file, this.diskFileSystemProvider, Schemas.vscodeUserData, logService)); this.fileService = fileService; this.backupResourceJoiners = []; @@ -275,13 +275,13 @@ flakySuite('WorkingCopyBackupService', () => { // No Type ID let backupId = toUntypedWorkingCopyId(backupResource); let filePathHash = hashIdentifier(backupId); - let expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.file, filePathHash)).with({ scheme: Schemas.userData }).toString(); + let expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.file, filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); // With Type ID backupId = toTypedWorkingCopyId(backupResource); filePathHash = hashIdentifier(backupId); - expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.file, filePathHash)).with({ scheme: Schemas.userData }).toString(); + expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.file, filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); }); @@ -294,13 +294,13 @@ flakySuite('WorkingCopyBackupService', () => { // No Type ID let backupId = toUntypedWorkingCopyId(backupResource); let filePathHash = hashIdentifier(backupId); - let expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.untitled, filePathHash)).with({ scheme: Schemas.userData }).toString(); + let expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.untitled, filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); // With Type ID backupId = toTypedWorkingCopyId(backupResource); filePathHash = hashIdentifier(backupId); - expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.untitled, filePathHash)).with({ scheme: Schemas.userData }).toString(); + expectedPath = URI.file(join(backupHome, workspaceHash, Schemas.untitled, filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); }); @@ -313,13 +313,13 @@ flakySuite('WorkingCopyBackupService', () => { // No Type ID let backupId = toUntypedWorkingCopyId(backupResource); let filePathHash = hashIdentifier(backupId); - let expectedPath = URI.file(join(backupHome, workspaceHash, 'custom', filePathHash)).with({ scheme: Schemas.userData }).toString(); + let expectedPath = URI.file(join(backupHome, workspaceHash, 'custom', filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); // With Type ID backupId = toTypedWorkingCopyId(backupResource); filePathHash = hashIdentifier(backupId); - expectedPath = URI.file(join(backupHome, workspaceHash, 'custom', filePathHash)).with({ scheme: Schemas.userData }).toString(); + expectedPath = URI.file(join(backupHome, workspaceHash, 'custom', filePathHash)).with({ scheme: Schemas.vscodeUserData }).toString(); assert.strictEqual(service.toBackupResource(backupId).toString(), expectedPath); }); }); diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts index 64247174d7f..4b519cc730e 100644 --- a/src/vs/workbench/test/browser/workbenchTestServices.ts +++ b/src/vs/workbench/test/browser/workbenchTestServices.ts @@ -1138,7 +1138,7 @@ export class InMemoryTestWorkingCopyBackupService extends BrowserWorkingCopyBack const logService = new NullLogService(); const fileService = new FileService(logService); fileService.registerProvider(Schemas.file, new InMemoryFileSystemProvider()); - fileService.registerProvider(Schemas.userData, new InMemoryFileSystemProvider()); + fileService.registerProvider(Schemas.vscodeUserData, new InMemoryFileSystemProvider()); super(new TestContextService(TestWorkspace), environmentService, fileService, logService);