force reload

Author: hverlin

src/miseExtension.ts

@@ -287,9 +287,7 @@ export class MiseExtension {
 			}
 		});
 
-		const globalCmdCache = createCache({
-			ttl: 1,
-		}).define("reload", async () => {
+		const reloadConfiguration = async () => {
 			try {
 				logger.info("Reloading Mise configuration");
 				this.updateStatusBar({ state: "loading" });
@@ -347,18 +345,35 @@ export class MiseExtension {
 
 			void this.checkForInvalidMiseConfigFiles();
 			await this.updateStatusBarTooltip();
-		});
+		};
+
+		// internal triggers (file watcher, task end, config change) come in
+		// storms: close reloads are coalesced into one
+		const globalCmdCache = createCache({
+			ttl: 1,
+		}).define("reload", reloadConfiguration);
 
 		context.subscriptions.push(
-			vscode.commands.registerCommand(MISE_RELOAD, async () => {
-				await globalCmdCache.reload();
-			}),
+			vscode.commands.registerCommand(
+				MISE_RELOAD,
+				async (options?: { force?: boolean }) => {
+					if (options?.force) {
+						// a deliberate state change (folder switch, reload asked by
+						// the user) must not be coalesced into an already running
+						// reload, which read the state from before the change
+						await globalCmdCache.clear();
+						await reloadConfiguration();
+						return;
+					}
+					await globalCmdCache.reload();
+				},
+			),
 			// only the reload the user asked for drops what was kept from before a
 			// config file broke: the internal reloads above must not empty the
 			// views while the file is still being typed
 			vscode.commands.registerCommand(MISE_RELOAD_FROM_USER, async () => {
 				this.miseService.forgetRetainedState();
-				await vscode.commands.executeCommand(MISE_RELOAD);
+				await vscode.commands.executeCommand(MISE_RELOAD, { force: true });
 			}),
 		);
 
@@ -396,7 +411,7 @@ export class MiseExtension {
 
 						if (selectedFolder) {
 							await setCurrentWorkspaceFolder(context, selectedFolder);
-							vscode.commands.executeCommand(MISE_RELOAD);
+							vscode.commands.executeCommand(MISE_RELOAD, { force: true });
 						}
 						return;
 					}
@@ -412,7 +427,7 @@ export class MiseExtension {
 					});
 					if (selectedFolder) {
 						await setCurrentWorkspaceFolder(context, selectedFolder);
-						vscode.commands.executeCommand(MISE_RELOAD);
+						vscode.commands.executeCommand(MISE_RELOAD, { force: true });
 					}
 				},
 			),
@@ -422,7 +437,7 @@ export class MiseExtension {
 			const workspaceFolders = vscode.workspace.workspaceFolders;
 			if (!workspaceFolders?.length) {
 				await clearCurrentWorkspaceFolder(context);
-				vscode.commands.executeCommand(MISE_RELOAD);
+				vscode.commands.executeCommand(MISE_RELOAD, { force: true });
 				return;
 			}
 
@@ -433,7 +448,7 @@ export class MiseExtension {
 				await setCurrentWorkspaceFolder(context, currentFolder);
 			}
 
-			vscode.commands.executeCommand(MISE_RELOAD);
+			vscode.commands.executeCommand(MISE_RELOAD, { force: true });
 		});
 
 		context.subscriptions.push(