Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-31 12:16:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #184918 from CodinGame/prevent-uncaught-error-on-cancel

Browse Source 
Prevent throwing Uncaught error on cancel
This commit is contained in:
Sandeep Somavarapu
2023-06-20 14:44:35 +02:00
committed by GitHub
parent 65d0bd757f 6182a99eed
commit 2bb3717d5d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/output/common/outputChannelModel.ts
+12 -3
View File
@@ -22,6 +22,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
import { ILogger, ILoggerService, ILogService } from 'vs/platform/log/common/log';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/output';
import { isCancellationError } from 'vs/base/common/errors';
export interface IOutputChannelModel extends IDisposable {
readonly onDispose: Event<void>;
@@ -61,7 +62,11 @@ class OutputFileListener extends Disposable {
private poll(): void {
const loop = () => this.doWatch().then(() => this.poll());
this.syncDelayer.trigger(loop);
this.syncDelayer.trigger(loop).catch(error => {
if (!isCancellationError(error)) {
throw error;
}
});
}
private async doWatch(): Promise<void> {
@@ -206,7 +211,7 @@ export class FileOutputChannelModel extends Disposable implements IOutputChannel
this.doUpdateModel(model, [EditOperation.delete(model.getFullModelRange())], VSBuffer.fromString(''));
}
private async appendContent(model: ITextModel, immediate: boolean, token: CancellationToken): Promise<void> {
private appendContent(model: ITextModel, immediate: boolean, token: CancellationToken): void {
this.appendThrottler.trigger(async () => {
/* Abort if operation is cancelled */
if (token.isCancellationRequested) {
@@ -234,7 +239,11 @@ export class FileOutputChannelModel extends Disposable implements IOutputChannel
const lastLineMaxColumn = model.getLineMaxColumn(lastLine);
const edits = [EditOperation.insert(new Position(lastLine, lastLineMaxColumn), contentToAppend.toString())];
this.doUpdateModel(model, edits, contentToAppend);
}, immediate ? 0 : undefined);
}, immediate ? 0 : undefined).catch(error => {
if (!isCancellationError(error)) {
throw error;
}
});
}
private async replaceContent(model: ITextModel, token: CancellationToken): Promise<void> {