From 643a15e56f46322f8ab0814b862bfa85017d960f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 28 Jul 2018 21:37:49 -0700
Subject: [PATCH] Settings editor - fix not focusing search when restoring
 editor setInput must be actually async. Will be fixed naturally when we
 aren't using winJS promises...

---
 .../workbench/parts/preferences/browser/settingsEditor2.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 5803a5f97fc..6affe34a687 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -139,8 +139,8 @@ export class SettingsEditor2 extends BaseEditor {
 		this.inSettingsEditorContextKey.set(true);
 		return super.setInput(input, options, token)
 			.then(() => {
-				this.render(token);
-			});
+				return this.render(token);
+			}).then(() => new Promise(process.nextTick)); // Force setInput to be async
 	}
 
 	clearInput(): void {
@@ -573,7 +573,7 @@ export class SettingsEditor2 extends BaseEditor {
 
 					this._register(model.onDidChangeGroups(() => this.onConfigUpdate()));
 					this.defaultSettingsEditorModel = model;
-					this.onConfigUpdate();
+					return this.onConfigUpdate();
 				});
 		}
 		return TPromise.as(null);
-- 
GitLab