From 07d00198a86e4ac1f0691efa94d8610d766fe7fc Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 24 Jul 2019 12:20:48 +0200 Subject: [PATCH] render preferences features only for settings files --- .../services/preferences/browser/preferencesService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index 96a7a241493..8788a416741 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -158,7 +158,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic return Promise.resolve(null); } - async createPreferencesEditorModel(uri: URI): Promise> { + async createPreferencesEditorModel(uri: URI): Promise | null> { if (this.isDefaultSettingsResource(uri)) { return this.createDefaultSettingsEditorModel(uri); } @@ -174,7 +174,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) { const settingsUri = await this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, uri); - if (settingsUri) { + if (settingsUri && settingsUri.toString() === uri.toString()) { return this.createEditableSettingsEditorModel(ConfigurationTarget.WORKSPACE_FOLDER, uri); } } @@ -185,7 +185,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic return this.createEditableSettingsEditorModel(ConfigurationTarget.USER_REMOTE, uri); } - return Promise.reject(`unknown resource: ${uri.toString()}`); + return null; } openRawDefaultSettings(): Promise { -- GitLab