From ada1588bb752669240ad0d1b42bd26837b37c3b4 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Wed, 20 Jul 2022 12:50:11 -0700
Subject: [PATCH] Fix BDC tree getting stuck loading (#20116)

---
 .../tree/controllerTreeDataProvider.ts             | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts b/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
index 2490b4293b..b6111d0b6d 100644
--- a/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
+++ b/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
@@ -42,12 +42,11 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 		}
 
 		if (!this.initialized) {
-			this.loadSavedControllers().catch(err => { vscode.window.showErrorMessage(localize('bdc.controllerTreeDataProvider.error', "Unexpected error loading saved controllers: {0}", err)); });
-		} else {
-			// We set the context here since VS Code takes a bit of time to process the _onDidChangeTreeData
-			// and so if we set it as soon as we finished loading the controllers it would briefly flash
-			// the "connect to controller" welcome view
-			await vscode.commands.executeCommand('setContext', 'bdc.loaded', true);
+			try {
+				await this.loadSavedControllers();
+			} catch (err) {
+				void vscode.window.showErrorMessage(localize('bdc.controllerTreeDataProvider.error', "Unexpected error loading saved controllers: {0}", err));
+			}
 		}
 
 		return this.root.getChildren();
@@ -132,13 +131,12 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 
 			this.root.clearChildren();
 			treeNodes.forEach(node => this.root.addChild(node));
-			this.notifyNodeChanged();
+			await vscode.commands.executeCommand('setContext', 'bdc.loaded', true);
 		} catch (err) {
 			// Reset so we can try again if the tree refreshes
 			this.initialized = false;
 			throw err;
 		}
-
 	}
 
 	public async saveControllers(): Promise<void> {