Updates error handling for paused operations

Author: d13

src/views/viewCommands.ts

@@ -715,24 +715,45 @@ export class ViewCommands implements Disposable {
 	}
 
 	@log()
-	private abortPausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async abortPausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).abortPausedOperation?.();
+		const abortPausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).abortPausedOperation;
+		if (abortPausedOperation == null) return;
+
+		try {
+			await abortPausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()
-	private continuePausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async continuePausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
+
+		const continuePausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation;
+		if (continuePausedOperation == null) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation?.();
+		try {
+			await continuePausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()
-	private skipPausedOperation(node: PausedOperationStatusNode) {
-		if (!node.is('paused-operation-status')) return Promise.resolve();
+	private async skipPausedOperation(node: PausedOperationStatusNode) {
+		if (!node.is('paused-operation-status')) return;
+
+		const continuePausedOperation = this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation;
+		if (continuePausedOperation == null) return;
 
-		return this.container.git.status(node.pausedOpStatus.repoPath).continuePausedOperation?.({ skip: true });
+		try {
+			await continuePausedOperation({ skip: true });
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	@log()

src/webviews/home/homeWebview.ts

@@ -1,5 +1,5 @@
 import type { ConfigurationChangeEvent } from 'vscode';
-import { Disposable, Uri, workspace } from 'vscode';
+import { Disposable, Uri, window, workspace } from 'vscode';
 import type { CreatePullRequestActionContext } from '../../api/gitlens';
 import type { EnrichedAutolink } from '../../autolinks';
 import { getAvatarUriFromGravatarEmail } from '../../avatars';
@@ -463,18 +463,42 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	}
 
 	private async abortPausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
-		await this.container.git.status(pausedOpArgs.operation.repoPath).abortPausedOperation?.();
+		const abortPausedOperation = this.container.git.status(pausedOpArgs.operation.repoPath).abortPausedOperation;
+		if (abortPausedOperation == null) return;
+
+		try {
+			await abortPausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	private async continuePausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
 		if (pausedOpArgs.operation.type === 'revert') return;
-		await this.container.git.status(pausedOpArgs.operation.repoPath).continuePausedOperation?.();
+
+		const continuePausedOperation = this.container.git.status(
+			pausedOpArgs.operation.repoPath,
+		).continuePausedOperation;
+		if (continuePausedOperation == null) return;
+
+		try {
+			await continuePausedOperation();
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	private async skipPausedOperation(pausedOpArgs: GitPausedOperationCommandArgs) {
-		if (pausedOpArgs.operation.type === 'merge') return;
-
-		await this.container.git.status(pausedOpArgs.operation.repoPath).continuePausedOperation?.({ skip: true });
+		const continuePausedOperation = this.container.git.status(
+			pausedOpArgs.operation.repoPath,
+		).continuePausedOperation;
+		if (continuePausedOperation == null) return;
+
+		try {
+			await continuePausedOperation({ skip: true });
+		} catch (ex) {
+			void window.showErrorMessage(ex.message);
+		}
 	}
 
 	private async openRebaseEditor(pausedOpArgs: GitPausedOperationCommandArgs) {