Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

#75079 Use URI for settings

Browse Source
This commit is contained in:
Sandeep Somavarapu
2019-06-07 18:44:17 +02:00
parent 50e1c61cbb
commit 70d9efeac2
16 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ class SettingsTestEnvironmentService extends EnvironmentService {
super(args, _execPath);
}
get appSettingsPath(): string { return this.customAppSettingsHome; }
get settingsResource(): URI { return URI.file(this.customAppSettingsHome); }
}
suite('ConfigurationEditingService', () => {
@@ -105,7 +105,7 @@ suite('ConfigurationEditingService', () => {
instantiationService.stub(IEnvironmentService, environmentService);
const remoteAgentService = instantiationService.createInstance(RemoteAgentService, {});
instantiationService.stub(IRemoteAgentService, remoteAgentService);
const workspaceService = new WorkspaceService({ userSettingsResource: URI.file(environmentService.appSettingsPath), configurationCache: new ConfigurationCache(environmentService) }, new ConfigurationFileService(), remoteAgentService);
const workspaceService = new WorkspaceService({ userSettingsResource: environmentService.settingsResource, configurationCache: new ConfigurationCache(environmentService) }, new ConfigurationFileService(), remoteAgentService);
instantiationService.stub(IWorkspaceContextService, workspaceService);
return workspaceService.initialize(noWorkspace ? { id: '' } : { folder: URI.file(workspaceDir), id: createHash('md5').update(URI.file(workspaceDir).toString()).digest('hex') }).then(() => {
instantiationService.stub(IConfigurationService, workspaceService);