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

fixes #90478

Browse Source
This commit is contained in:
isidor
2020-02-13 09:47:55 +01:00
parent 1d50055a9f
commit 89a1183946
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
+5 -5
View File
@@ -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) {
src/vs/workbench/contrib/debug/common/debug.ts
+1 -1
View File
@@ -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;
}