From 3f4baf46c6fe7a99c41e1b618290b27ce807e84a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 17 Jun 2021 14:01:18 +0200
Subject: [PATCH] move focus check while converting

---
 .../editor/browser/editorOverrideService.ts   | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/services/editor/browser/editorOverrideService.ts b/src/vs/workbench/services/editor/browser/editorOverrideService.ts
index 939aa018b5269..5d87f892e2a6e 100644
--- a/src/vs/workbench/services/editor/browser/editorOverrideService.ts
+++ b/src/vs/workbench/services/editor/browser/editorOverrideService.ts
@@ -66,12 +66,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 		// Read in the cache on statup
 		this.cache = new Set<string>(JSON.parse(this.storageService.get(EditorOverrideService.overrideCacheStorageID, StorageScope.GLOBAL, JSON.stringify([]))));
 		this.storageService.remove(EditorOverrideService.overrideCacheStorageID, StorageScope.GLOBAL);
-		this.hostService.hadLastFocus().then(hadLastFocus => {
-			if (!hadLastFocus) {
-				return;
-			}
-			this.convertOldAssociationFormat();
-		});
+		this.convertOldAssociationFormat();
 
 		this._register(this.storageService.onWillSaveState(() => {
 			// We want to store the glob patterns we would activate on, this allows us to know if we need to await the ext host on startup for opening a resource
@@ -188,20 +183,25 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 	}
 
 	private convertOldAssociationFormat(): void {
-		const rawAssociations = this.configurationService.getValue<EditorAssociations | { [fileNamePattern: string]: string }>(editorsAssociationsSettingId) || {};
-		// If it's not an array, then it's the new format
-		if (!Array.isArray(rawAssociations)) {
-			return;
-		}
-		let newSettingObject = Object.create(null);
-		// Make the correctly formatted object from the array and then set that object
-		for (const association of rawAssociations) {
-			if (association.filenamePattern) {
-				newSettingObject[association.filenamePattern] = association.viewType;
+		this.hostService.hadLastFocus().then(hadLastFocus => {
+			if (!hadLastFocus) {
+				return;
 			}
-		}
-		this.logService.info(`Migrating ${editorsAssociationsSettingId}`);
-		this.configurationService.updateValue(editorsAssociationsSettingId, newSettingObject);
+			const rawAssociations = this.configurationService.getValue<EditorAssociations | { [fileNamePattern: string]: string }>(editorsAssociationsSettingId) || {};
+			// If it's not an array, then it's the new format
+			if (!Array.isArray(rawAssociations)) {
+				return;
+			}
+			let newSettingObject = Object.create(null);
+			// Make the correctly formatted object from the array and then set that object
+			for (const association of rawAssociations) {
+				if (association.filenamePattern) {
+					newSettingObject[association.filenamePattern] = association.viewType;
+				}
+			}
+			this.logService.info(`Migrating ${editorsAssociationsSettingId}`);
+			this.configurationService.updateValue(editorsAssociationsSettingId, newSettingObject);
+		});
 	}
 
 	private getAllUserAssociations(): EditorAssociations {