From 89a1183946e430adb5500aeaecba315dec1f6776 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 13 Feb 2020 09:47:55 +0100 Subject: [PATCH] fixes #90478 --- .../workbench/contrib/debug/browser/debugTaskRunner.ts | 10 +++++----- src/vs/workbench/contrib/debug/common/debug.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts index a0aea70ae0e..231ac807506 100644 --- a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts +++ b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts @@ -72,7 +72,7 @@ export class DebugTaskRunner { await this.viewsService.openView(Constants.MARKERS_VIEW_ID); return Promise.resolve(TaskRunResult.Failure); } - if (onTaskErrors === 'cancel') { + if (onTaskErrors === 'abort') { return Promise.resolve(TaskRunResult.Failure); } @@ -85,7 +85,7 @@ export class DebugTaskRunner { ? nls.localize('preLaunchTaskExitCode', "The preLaunchTask '{0}' terminated with exit code {1}.", taskLabel, taskSummary.exitCode) : nls.localize('preLaunchTaskTerminated', "The preLaunchTask '{0}' terminated.", taskLabel); - const result = await this.dialogService.show(severity.Warning, message, [nls.localize('debugAnyway', "Debug Anyway"), nls.localize('showErrors', "Show Errors"), nls.localize('cancel', "Cancel")], { + const result = await this.dialogService.show(severity.Warning, message, [nls.localize('debugAnyway', "Debug Anyway"), nls.localize('showErrors', "Show Errors"), nls.localize('abort', "Abort")], { checkbox: { label: nls.localize('remember', "Remember my choice in user settings"), }, @@ -94,12 +94,12 @@ export class DebugTaskRunner { const debugAnyway = result.choice === 0; - const cancel = result.choice = 2; + const abort = result.choice === 2; if (result.checkboxChecked) { - this.configurationService.updateValue('debug.onTaskErrors', result.choice === 0 ? 'debugAnyway' : cancel ? 'cancel' : 'showErrors'); + this.configurationService.updateValue('debug.onTaskErrors', result.choice === 0 ? 'debugAnyway' : abort ? 'abort' : 'showErrors'); } - if (cancel) { + if (abort) { return Promise.resolve(TaskRunResult.Failure); } if (debugAnyway) { diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts index 6d540653dbf..56424879c1c 100644 --- a/src/vs/workbench/contrib/debug/common/debug.ts +++ b/src/vs/workbench/contrib/debug/common/debug.ts @@ -467,7 +467,7 @@ export interface IDebugConfiguration { closeOnEnd: boolean; }; focusWindowOnBreak: boolean; - onTaskErrors: 'debugAnyway' | 'showErrors' | 'prompt' | 'cancel'; + onTaskErrors: 'debugAnyway' | 'showErrors' | 'prompt' | 'abort'; showBreakpointsInOverviewRuler: boolean; showInlineBreakpointCandidates: boolean; }