From 4988010d4063b07c5fa9805e4efe8654ed056f31 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 19 Sep 2017 13:11:00 +0200 Subject: [PATCH] Use toResource method in workspace context service --- .../parts/preferences/browser/preferencesService.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts index 2bda7b84eb6..49c69f7201f 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts @@ -320,18 +320,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic return null; } const workspace = this.contextService.getWorkspace(); - return workspace.configuration || this.toResource(paths.join('.vscode', 'settings.json'), workspace.folders[0].uri); + return workspace.configuration || this.contextService.toResource(paths.join('.vscode', 'settings.json'), workspace.folders[0]); case ConfigurationTarget.FOLDER: const folder = this.contextService.getWorkspaceFolder(resource); - return folder ? this.toResource(paths.join('.vscode', 'settings.json'), folder.uri) : null; + return folder ? this.contextService.toResource(paths.join('.vscode', 'settings.json'), folder) : null; } return null; } - private toResource(relativePath: string, root: URI): URI { - return URI.file(paths.join(root.fsPath, relativePath)); - } - private createSettingsIfNotExists(target: ConfigurationTarget, resource: URI): TPromise { if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && target === ConfigurationTarget.WORKSPACE) { if (!this.configurationService.keys().workspace.length) { -- GitLab