@codingame/monaco-vscode-debug-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/debug/browser/debugSettingMigration.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/debug/browser/debugSettingMigration.js

@@ -1,3 +1,4 @@
+
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 

package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.d.ts

@@ -0,0 +1,14 @@
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IStatusbarService } from "vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+export declare class DebugStatusContribution implements IWorkbenchContribution {
+    private readonly statusBarService;
+    private readonly debugService;
+    private showInStatusBar;
+    private toDispose;
+    private entryAccessor;
+    constructor(statusBarService: IStatusbarService, debugService: IDebugService, configurationService: IConfigurationService);
+    private get entry();
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/debug/browser/debugStatus.js

@@ -1,8 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
 let DebugStatusContribution = class DebugStatusContribution {
@@ -11,7 +14,7 @@ let DebugStatusContribution = class DebugStatusContribution {
         this.debugService = debugService;
         this.toDispose = [];
         const addStatusBarEntry = () => {
-            this.entryAccessor = this.statusBarService.addEntry(this.entry, 'status.debug', 0 , 30 );
+            this.entryAccessor = this.statusBarService.addEntry(this.entry, 'status.debug', StatusbarAlignment.LEFT, 30 );
         };
         const setShowInStatusBar = () => {
             this.showInStatusBar = configurationService.getValue('debug').showInStatusBar;
@@ -21,7 +24,7 @@ let DebugStatusContribution = class DebugStatusContribution {
         };
         setShowInStatusBar();
         this.toDispose.push(this.debugService.onDidChangeState(state => {
-            if (state !== 0  && this.showInStatusBar === 'onFirstSessionStart' && !this.entryAccessor) {
+            if (state !== State.Inactive && this.showInStatusBar === 'onFirstSessionStart' && !this.entryAccessor) {
                 addStatusBarEntry();
             }
         }));
@@ -47,10 +50,10 @@ let DebugStatusContribution = class DebugStatusContribution {
             text = (manager.getLaunches().length > 1 ? `${name} (${manager.selectedConfiguration.launch.name})` : name);
         }
         return {
-            name: ( localize(6050, "Debug")),
+            name: ( localize(5372, "Debug")),
             text: '$(debug-alt-small) ' + text,
-            ariaLabel: ( localize(6051, "Debug: {0}", text)),
-            tooltip: ( localize(6052, "Select and Start Debug Configuration")),
+            ariaLabel: ( localize(5373, "Debug: {0}", text)),
+            tooltip: ( localize(5374, "Select and Start Debug Configuration")),
             command: 'workbench.action.debug.selectandstart'
         };
     }
@@ -59,10 +62,10 @@ let DebugStatusContribution = class DebugStatusContribution {
         dispose(this.toDispose);
     }
 };
-DebugStatusContribution = ( (__decorate([
-    ( (__param(0, IStatusbarService))),
-    ( (__param(1, IDebugService))),
-    ( (__param(2, IConfigurationService)))
-], DebugStatusContribution)));
+DebugStatusContribution = ( __decorate([
+    ( __param(0, IStatusbarService)),
+    ( __param(1, IDebugService)),
+    ( __param(2, IConfigurationService))
+], DebugStatusContribution));
 
 export { DebugStatusContribution };

package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.d.ts

@@ -0,0 +1,36 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IMarkerService } from "vscode/vscode/vs/platform/markers/common/markers.service";
+import { IProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkspace, IWorkspaceFolder } from "vscode/vscode/vs/platform/workspace/common/workspace";
+import { ITaskIdentifier } from "vscode/vscode/vs/workbench/contrib/tasks/common/tasks";
+import { ITaskSummary } from "@codingame/monaco-vscode-625898ab-0e33-5b7f-a3ae-29c10271dc1c-common/vscode/vs/workbench/contrib/tasks/common/taskService";
+import { ITaskService } from "vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+export declare enum TaskRunResult {
+    Failure = 0,
+    Success = 1
+}
+interface IRunnerTaskSummary extends ITaskSummary {
+    cancelled?: boolean;
+}
+export declare class DebugTaskRunner implements IDisposable {
+    private readonly taskService;
+    private readonly markerService;
+    private readonly configurationService;
+    private readonly viewsService;
+    private readonly dialogService;
+    private readonly storageService;
+    private readonly commandService;
+    private readonly progressService;
+    private globalCancellation;
+    constructor(taskService: ITaskService, markerService: IMarkerService, configurationService: IConfigurationService, viewsService: IViewsService, dialogService: IDialogService, storageService: IStorageService, commandService: ICommandService, progressService: IProgressService);
+    cancel(): void;
+    dispose(): void;
+    runTaskAndCheckErrors(root: IWorkspaceFolder | IWorkspace | undefined, taskId: string | ITaskIdentifier | undefined): Promise<TaskRunResult>;
+    runTask(root: IWorkspace | IWorkspaceFolder | undefined, taskId: string | ITaskIdentifier | undefined, token?: import("vscode/vscode/vs/base/common/cancellation").CancellationToken): Promise<IRunnerTaskSummary | null>;
+}
+export {};

package/vscode/src/vs/workbench/contrib/debug/browser/debugTaskRunner.js

@@ -1,30 +1,38 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { Markers } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
-import { CustomTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
+import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
+import { Markers } from '@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common/vscode/vs/workbench/contrib/markers/common/markers';
+import { TaskEventKind, CustomTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const onceFilter = (event, filter) => Event.once(Event.filter(event, filter));
+var TaskRunResult;
+(function (TaskRunResult) {
+    TaskRunResult[TaskRunResult["Failure"] = 0] = "Failure";
+    TaskRunResult[TaskRunResult["Success"] = 1] = "Success";
+})(TaskRunResult || (TaskRunResult = {}));
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
-const ABORT_LABEL = ( localize(5805, "Abort"));
-const DEBUG_ANYWAY_LABEL = ( localize(5806, "&&Debug Anyway"));
-const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5807, "Debug Anyway"));
+const ABORT_LABEL = ( localize(5375, "Abort"));
+const DEBUG_ANYWAY_LABEL = ( localize(5376, "&&Debug Anyway"));
+const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5377, "Debug Anyway"));
 let DebugTaskRunner = class DebugTaskRunner {
     constructor(taskService, markerService, configurationService, viewsService, dialogService, storageService, commandService, progressService) {
         this.taskService = taskService;
@@ -35,11 +43,11 @@ let DebugTaskRunner = class DebugTaskRunner {
         this.storageService = storageService;
         this.commandService = commandService;
         this.progressService = progressService;
-        this.globalCancellation = ( (new CancellationTokenSource()));
+        this.globalCancellation = ( new CancellationTokenSource());
     }
     cancel() {
         this.globalCancellation.dispose(true);
-        this.globalCancellation = ( (new CancellationTokenSource()));
+        this.globalCancellation = ( new CancellationTokenSource());
     }
     dispose() {
         this.globalCancellation.dispose(true);
@@ -48,43 +56,43 @@ let DebugTaskRunner = class DebugTaskRunner {
         try {
             const taskSummary = await this.runTask(root, taskId, this.globalCancellation.token);
             if (taskSummary && (taskSummary.exitCode === undefined || taskSummary.cancelled)) {
-                return 0 ;
+                return TaskRunResult.Failure;
             }
             const errorCount = taskId ? this.markerService.read({ severities: MarkerSeverity.Error, take: 2 }).length : 0;
             const successExitCode = taskSummary && taskSummary.exitCode === 0;
             const failureExitCode = taskSummary && taskSummary.exitCode !== 0;
             const onTaskErrors = this.configurationService.getValue('debug').onTaskErrors;
             if (successExitCode || onTaskErrors === 'debugAnyway' || (errorCount === 0 && !failureExitCode)) {
-                return 1 ;
+                return TaskRunResult.Success;
             }
             if (onTaskErrors === 'showErrors') {
                 await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             if (onTaskErrors === 'abort') {
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( localize(5808, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
+                ? ( localize(5378, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localize(5809, "Error exists after running preLaunchTask '{0}'.", taskLabel))
+                    ? ( localize(5379, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localize(
-                5810,
+                5380,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localize(5811, "The preLaunchTask '{0}' terminated.", taskLabel));
+                        : ( localize(5381, "The preLaunchTask '{0}' terminated.", taskLabel));
             let DebugChoice;
-            ( ((function(DebugChoice) {
+            (function (DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 1] = "DebugAnyway";
                 DebugChoice[DebugChoice["ShowErrors"] = 2] = "ShowErrors";
                 DebugChoice[DebugChoice["Cancel"] = 0] = "Cancel";
-            })(DebugChoice || (DebugChoice = {}))));
+            })(DebugChoice || (DebugChoice = {}));
             const { result, checkboxChecked } = await this.dialogService.prompt({
-                type: Severity$1.Warning,
+                type: Severity.Warning,
                 message,
                 buttons: [
                     {
@@ -92,7 +100,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( localize(5812, "&&Show Errors")),
+                        label: ( localize(5382, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
@@ -101,7 +109,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localize(5813, "Remember my choice in user settings")),
+                    label: ( localize(5383, "Remember my choice in user settings")),
                 }
             });
             const debugAnyway = result === DebugChoice.DebugAnyway;
@@ -110,34 +118,34 @@ let DebugTaskRunner = class DebugTaskRunner {
                 this.configurationService.updateValue('debug.onTaskErrors', result === DebugChoice.DebugAnyway ? 'debugAnyway' : abort ? 'abort' : 'showErrors');
             }
             if (abort) {
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             if (debugAnyway) {
-                return 1 ;
+                return TaskRunResult.Success;
             }
             await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-            return Promise.resolve(0 );
+            return Promise.resolve(TaskRunResult.Failure);
         }
         catch (err) {
             const taskConfigureAction = this.taskService.configureAction();
-            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, 1 , '{}'));
+            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, StorageScope.WORKSPACE, '{}'));
             let choice = -1;
             let DebugChoice;
-            ( ((function(DebugChoice) {
+            (function (DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 0] = "DebugAnyway";
                 DebugChoice[DebugChoice["ConfigureTask"] = 1] = "ConfigureTask";
                 DebugChoice[DebugChoice["Cancel"] = 2] = "Cancel";
-            })(DebugChoice || (DebugChoice = {}))));
+            })(DebugChoice || (DebugChoice = {}));
             if (choiceMap[err.message] !== undefined) {
                 choice = choiceMap[err.message];
             }
             else {
                 const { result, checkboxChecked } = await this.dialogService.prompt({
-                    type: Severity$1.Error,
+                    type: Severity.Error,
                     message: err.message,
                     buttons: [
                         {
-                            label: ( localize(5806, "&&Debug Anyway")),
+                            label: ( localize(5376, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -149,19 +157,19 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localize(5814, "Remember my choice for this task"))
+                        label: ( localize(5384, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
                 if (checkboxChecked) {
                     choiceMap[err.message] = choice;
-                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), 1 , 1 );
+                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), StorageScope.WORKSPACE, StorageTarget.MACHINE);
                 }
             }
             if (choice === DebugChoice.ConfigureTask) {
                 await taskConfigureAction.run();
             }
-            return choice === DebugChoice.DebugAnyway ? 1  : 0 ;
+            return choice === DebugChoice.DebugAnyway ? TaskRunResult.Success : TaskRunResult.Failure;
         }
     }
     async runTask(root, taskId, token = this.globalCancellation.token) {
@@ -169,44 +177,44 @@ let DebugTaskRunner = class DebugTaskRunner {
             return Promise.resolve(null);
         }
         if (!root) {
-            return Promise.reject(( (new Error(( localize(
-                5815,
+            return Promise.reject(( new Error(( localize(
+                5385,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
-            ))))));
+            )))));
         }
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localize(5816, "Could not find the task '{0}'.", taskId))
-                : ( localize(5817, "Could not find the specified task."));
-            return Promise.reject(createErrorWithActions(errorMessage, [( (new Action(
+                ? ( localize(5386, "Could not find the task '{0}'.", taskId))
+                : ( localize(5387, "Could not find the specified task."));
+            return Promise.reject(createErrorWithActions(errorMessage, [( new Action(
                 DEBUG_CONFIGURE_COMMAND_ID,
                 DEBUG_CONFIGURE_LABEL,
                 undefined,
                 true,
                 () => this.commandService.executeCommand(DEBUG_CONFIGURE_COMMAND_ID)
-            )))]));
+            ))]));
         }
         let taskStarted = false;
-        const store = ( (new DisposableStore()));
+        const store = ( new DisposableStore());
         const getTaskKey = (t) => t.getKey() ?? t.getMapKey();
         const taskKey = getTaskKey(task);
-        const inactivePromise = ( (new Promise(
+        const inactivePromise = ( new Promise(
             (resolve) => store.add(onceFilter(this.taskService.onDidStateChange, e => {
-                return (e.kind === "inactive"
-                    || (e.kind === "processEnded"  && e.exitCode === undefined))
+                return (e.kind === TaskEventKind.Inactive
+                    || (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
                     && getTaskKey(e.__task) === taskKey;
             })(e => {
                 taskStarted = true;
-                resolve(e.kind === "processEnded"  ? { exitCode: e.exitCode } : null);
+                resolve(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
             }))
-        )));
-        store.add(onceFilter(this.taskService.onDidStateChange, e => (((e.kind === "active") ) || ((e.kind === "dependsOnStarted") )) && getTaskKey(e.__task) === taskKey)(() => {
+        ));
+        store.add(onceFilter(this.taskService.onDidStateChange, e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey)(() => {
             taskStarted = true;
         }));
-        const didAcquireInput = store.add(( (new Emitter())));
-        store.add(onceFilter(this.taskService.onDidStateChange, e => ((e.kind === "acquiredInput") ) && getTaskKey(e.__task) === taskKey)(() => didAcquireInput.fire()));
+        const didAcquireInput = store.add(( new Emitter()));
+        store.add(onceFilter(this.taskService.onDidStateChange, e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey)(() => didAcquireInput.fire()));
         const taskDonePromise = this.taskService.getActiveTasks().then(async (tasks) => {
             if (tasks.find(t => getTaskKey(t) === taskKey)) {
                 didAcquireInput.fire();
@@ -223,7 +231,7 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             return taskPromise.then(x => x ?? null);
         });
-        const result = ( (new Promise((resolve, reject) => {
+        const result = ( new Promise((resolve, reject) => {
             taskDonePromise.then(result => {
                 taskStarted = true;
                 resolve(result);
@@ -237,27 +245,27 @@ let DebugTaskRunner = class DebugTaskRunner {
                 store.add(disposableTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = ( localize(
-                            5818,
+                            5388,
                             "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.",
                             typeof taskId === 'string' ? taskId : JSON.stringify(taskId)
                         ));
-                        reject({ severity: Severity$1.Error, message: errorMessage });
+                        reject({ severity: Severity.Error, message: errorMessage });
                     }
                 }, waitTime));
                 const hideSlowPreLaunchWarning = this.configurationService.getValue('debug').hideSlowPreLaunchWarning;
                 if (!hideSlowPreLaunchWarning) {
                     store.add(disposableTimeout(() => {
                         const message = ( localize(
-                            5819,
+                            5389,
                             "Waiting for preLaunchTask '{0}'...",
                             task.configurationProperties.name
                         ));
                         const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
                         const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
                         if (canConfigure) {
-                            buttons.splice(1, 0, ( localize(5820, "Configure Task")));
+                            buttons.splice(1, 0, ( localize(5390, "Configure Task")));
                         }
-                        this.progressService.withProgress({ location: 15 , title: message, buttons }, () => result.catch(() => { }), (choice) => {
+                        this.progressService.withProgress({ location: ProgressLocation.Notification, title: message, buttons }, () => result.catch(() => { }), (choice) => {
                             if (choice === undefined) ;
                             else if (choice === 0) {
                                 resolve({ exitCode: 0 });
@@ -273,19 +281,19 @@ let DebugTaskRunner = class DebugTaskRunner {
                     }, 10_000));
                 }
             }));
-        })));
+        }));
         return result.finally(() => store.dispose());
     }
 };
-DebugTaskRunner = ( (__decorate([
-    ( (__param(0, ITaskService))),
-    ( (__param(1, IMarkerService))),
-    ( (__param(2, IConfigurationService))),
-    ( (__param(3, IViewsService))),
-    ( (__param(4, IDialogService))),
-    ( (__param(5, IStorageService))),
-    ( (__param(6, ICommandService))),
-    ( (__param(7, IProgressService)))
-], DebugTaskRunner)));
+DebugTaskRunner = ( __decorate([
+    ( __param(0, ITaskService)),
+    ( __param(1, IMarkerService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IViewsService)),
+    ( __param(4, IDialogService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, ICommandService)),
+    ( __param(7, IProgressService))
+], DebugTaskRunner));
 
-export { DebugTaskRunner };
+export { DebugTaskRunner, TaskRunResult };

package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.d.ts

@@ -0,0 +1,9 @@
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IHostService } from "vscode/vscode/vs/workbench/services/host/browser/host.service";
+import { ITitleService } from "vscode/vscode/vs/workbench/services/title/browser/titleService.service";
+export declare class DebugTitleContribution implements IWorkbenchContribution {
+    private toDispose;
+    constructor(debugService: IDebugService, hostService: IHostService, titleService: ITitleService);
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/debug/browser/debugTitle.js

@@ -1,4 +1,6 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
@@ -8,7 +10,7 @@ let DebugTitleContribution = class DebugTitleContribution {
     constructor(debugService, hostService, titleService) {
         this.toDispose = [];
         const updateTitle = () => {
-            if (debugService.state === 2  && !hostService.hasFocus) {
+            if (debugService.state === State.Stopped && !hostService.hasFocus) {
                 titleService.updateProperties({ prefix: '🔴' });
             }
             else {

package/vscode/src/vs/workbench/contrib/debug/browser/debugToolBar.d.ts

@@ -0,0 +1,54 @@
+import { IActionViewItem } from "vscode/vscode/vs/base/browser/ui/actionbar/actionbar";
+import { DisposableStore } from "vscode/vscode/vs/base/common/lifecycle";
+import { ServicesAccessor } from "vscode/vscode/vs/editor/browser/editorExtensions";
+import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
+import { MenuItemAction } from "vscode/vscode/vs/platform/actions/common/actions";
+import { IMenuService } from "vscode/vscode/vs/platform/actions/common/actions.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { Themable } from "vscode/vscode/vs/platform/theme/common/themeService";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+export declare class DebugToolBar extends Themable implements IWorkbenchContribution {
+    private readonly notificationService;
+    private readonly telemetryService;
+    private readonly debugService;
+    private readonly layoutService;
+    private readonly storageService;
+    private readonly configurationService;
+    private readonly instantiationService;
+    private $el;
+    private dragArea;
+    private actionBar;
+    private activeActions;
+    private updateScheduler;
+    private debugToolBarMenu;
+    private isVisible;
+    private isBuilt;
+    private readonly stopActionViewItemDisposables;
+    private readonly auxWindowCoordinates;
+    private readonly trackPixelRatioListener;
+    constructor(notificationService: INotificationService, telemetryService: ITelemetryService, debugService: IDebugService, layoutService: IWorkbenchLayoutService, storageService: IStorageService, configurationService: IConfigurationService, themeService: IThemeService, instantiationService: IInstantiationService, menuService: IMenuService, contextKeyService: IContextKeyService);
+    private registerListeners;
+    private getCurrentXPercent;
+    private getCurrentYPosition;
+    private storePosition;
+    updateStyles(): void;
+    private getStoredXPosition;
+    private getStoredYPosition;
+    private setCoordinates;
+    private get yDefault();
+    private _yRange;
+    private get yRange();
+    private show;
+    private doShowInActiveContainer;
+    private hide;
+    dispose(): void;
+}
+export declare function createDisconnectMenuItemAction(action: MenuItemAction, disposables: DisposableStore, accessor: ServicesAccessor, options: IDropdownWithPrimaryActionViewItemOptions): IActionViewItem | undefined;