From 9a91d3382e637d9f83210530fda00eb9a6e97960 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 26 Sep 2024 11:47:10 +0200 Subject: [PATCH] Cancelling application of edits results in a dialog notification (#229805) --- .../contrib/chat/browser/actions/codeBlockOperations.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts index 3149f4538d2..e4d58e6fdea 100644 --- a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts +++ b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts @@ -7,6 +7,7 @@ import { AsyncIterableObject } from '../../../../../base/common/async.js'; import { VSBuffer } from '../../../../../base/common/buffer.js'; import { CancellationTokenSource } from '../../../../../base/common/cancellation.js'; import { CharCode } from '../../../../../base/common/charCode.js'; +import { isCancellationError } from '../../../../../base/common/errors.js'; import { ResourceMap } from '../../../../../base/common/map.js'; import { isEqual } from '../../../../../base/common/resources.js'; import * as strings from '../../../../../base/common/strings.js'; @@ -241,7 +242,9 @@ export class ApplyCodeBlockOperation { return result; } } catch (e) { - this.notify(localize('applyCodeBlock.error', "Failed to apply code block: {0}", e.message)); + if (!isCancellationError(e)) { + this.notify(localize('applyCodeBlock.error', "Failed to apply code block: {0}", e.message)); + } } finally { cancellationTokenSource.dispose(); }