From 3d688527f93a1077a23032c55a829f3f4078d0db Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 26 Jun 2018 11:18:10 -0700
Subject: [PATCH] Settings editor - fix editing settings during search

---
 .../workbench/parts/preferences/browser/settingsEditor2.ts  | 4 ++++
 src/vs/workbench/parts/preferences/browser/settingsTree.ts  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 3e0bb79f096..1d24f2d8eea 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -565,6 +565,10 @@ export class SettingsEditor2 extends BaseEditor {
 
 		resolvedSettingsRoot.children.push(resolveExtensionsSettings(dividedGroups.extension || []));
 
+		if (this.searchResultModel) {
+			this.searchResultModel.updateChildren();
+		}
+
 		if (this.settingsTreeModel) {
 			this.settingsTreeModel.update(resolvedSettingsRoot);
 		} else {
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index eb577526abc..429b2628bc9 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -907,10 +907,12 @@ export class SearchResultModel {
 		}
 
 		this.rawSearchResults[type] = result;
+		this.updateChildren();
+	}
 
-		// Recompute children
+	updateChildren(): void {
 		this.children = this.getFlatSettings()
-			.map(s => createSettingsTreeSettingElement(s, result, this._viewState.settingsTarget, this._configurationService));
+			.map(s => createSettingsTreeSettingElement(s, this, this._viewState.settingsTarget, this._configurationService));
 	}
 
 	private getFlatSettings(): ISetting[] {
-- 
GitLab