@codingame/monaco-vscode-task-service-override 33.0.9 → 34.0.1

package/vscode/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.js

@@ -170,7 +170,7 @@ class TerminalTaskSystem extends Disposable {
         this._hasReconnected = false;
         this._terminalTabActions = [{
             id: RerunForActiveTerminalCommandId,
-            label: ( localize(13663, "Rerun Task")),
+            label: ( localize(13852, "Rerun Task")),
             icon: rerunTaskIcon
         }];
         this._taskStartTimes = ( new Map());
@@ -250,7 +250,7 @@ class TerminalTaskSystem extends Disposable {
             } else {
                 this._log(( error.toString()));
                 throw ( new TaskError(Severity.Error, ( localize(
-                    13664,
+                    13853,
                     "A unknown error has occurred while executing a task. See task output log for details."
                 )), TaskErrors.UnknownError));
             }
@@ -298,7 +298,7 @@ class TerminalTaskSystem extends Disposable {
             });
             const openOutput = "Show Output";
             this._notificationService.prompt(Severity.Warning, ( localize(
-                13665,
+                13854,
                 "There are issues with task \"{0}\". See the output for more details.",
                 task._label
             )), [{
@@ -421,19 +421,17 @@ class TerminalTaskSystem extends Disposable {
             });
         }
         return ( new Promise((resolve, reject) => {
-            const onDisposedListener = terminal.onDisposed(terminal => {
-                this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
-                onDisposedListener.dispose();
-            });
             const onExit = terminal.onExit(() => {
-                const task = activeTerminal.task;
+                const terminatedTask = activeTerminal.task;
                 try {
                     onExit.dispose();
-                    this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
+                    this._fireTaskEvent(
+                        TaskEvent.terminated(terminatedTask, terminal.instanceId, terminal.exitReason)
+                    );
                 } catch (error) {}
                 resolve({
                     success: true,
-                    task: task
+                    task: terminatedTask
                 });
             });
             terminal.dispose();
@@ -466,7 +464,7 @@ class TerminalTaskSystem extends Disposable {
         return Promise.all(promises);
     }
     _showDependencyCycleMessage(task) {
-        this._log(( localize(13666, "There is a dependency cycle. See task \"{0}\".", task._label)));
+        this._log(( localize(13855, "There is a dependency cycle. See task \"{0}\".", task._label)));
         this._showOutput();
     }
     _executeTask(
@@ -529,7 +527,7 @@ class TerminalTaskSystem extends Disposable {
                         }
                     } else {
                         this._log(( localize(
-                            13667,
+                            13856,
                             "Couldn't resolve dependent task '{0}' in workspace folder '{1}'",
                             isString(dependency.task) ? dependency.task : JSON.stringify(dependency.task, undefined, 0),
                             (dependency.uri.toString())
@@ -558,7 +556,9 @@ class TerminalTaskSystem extends Disposable {
                 };
             });
         }).finally(() => {
-            delete this._activeTasks[mapKey];
+            if (this._activeTasks[mapKey] === activeTask) {
+                delete this._activeTasks[mapKey];
+            }
         });
         const lastInstance = this._getInstances(task).pop();
         const count = lastInstance?.count ?? {
@@ -883,7 +883,7 @@ class TerminalTaskSystem extends Disposable {
             ));
             if ((problemMatchers.length > 0) && !watchingProblemMatcher.isWatching()) {
                 this._appendOutput(( localize(
-                    13668,
+                    13857,
                     "Task {0} is a background task but uses a problem matcher without a background pattern",
                     task._label
                 )));
@@ -966,6 +966,7 @@ class TerminalTaskSystem extends Disposable {
                 });
             }
             promise = ( new Promise((resolve, reject) => {
+                const boundTerminal = terminal;
                 const onExit = terminal.onExit(terminalLaunchResult => {
                     const exitCode = typeof terminalLaunchResult === "number" ? terminalLaunchResult : terminalLaunchResult?.code;
                     onData?.dispose();
@@ -974,7 +975,10 @@ class TerminalTaskSystem extends Disposable {
                     if (this._busyTasks[mapKey]) {
                         delete this._busyTasks[mapKey];
                     }
-                    this._removeFromActiveTasks(task);
+                    const cur = this._activeTasks[key];
+                    if (cur && cur.terminal === boundTerminal) {
+                        this._removeFromActiveTasks(task);
+                    }
                     this._fireTaskEvent(TaskEvent.changed());
                     if (terminalLaunchResult !== undefined) {
                         switch (task.command.presentation.panel) {
@@ -1087,11 +1091,15 @@ class TerminalTaskSystem extends Disposable {
                 startStopProblemMatcher.processLine(line);
             });
             promise = ( new Promise((resolve, reject) => {
+                const boundTerminal = terminal;
                 const onExit = terminal.onExit(terminalLaunchResult => {
                     const exitCode = typeof terminalLaunchResult === "number" ? terminalLaunchResult : terminalLaunchResult?.code;
                     onExit.dispose();
                     const key = task.getMapKey();
-                    this._removeFromActiveTasks(task);
+                    const cur = this._activeTasks[key];
+                    if (cur && cur.terminal === boundTerminal) {
+                        this._removeFromActiveTasks(task);
+                    }
                     this._fireTaskEvent(TaskEvent.changed());
                     if (terminalLaunchResult !== undefined) {
                         switch (task.command.presentation.panel) {
@@ -1326,11 +1334,11 @@ class TerminalTaskSystem extends Disposable {
             if (task.command.presentation && task.command.presentation.echo) {
                 if (needsFolderQualification && workspaceFolder) {
                     const folder = cwd && typeof cwd === "object" && Object.hasOwn(cwd, "path") ? basename(cwd.path) : workspaceFolder.name;
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13669, "Executing task in folder {0}: {1}", folder, commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13858, "Executing task in folder {0}: {1}", folder, commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 } else {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13670, "Executing task: {0}", commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13859, "Executing task: {0}", commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 }
@@ -1367,7 +1375,7 @@ class TerminalTaskSystem extends Disposable {
                 };
                 if (needsFolderQualification && workspaceFolder) {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        13669,
+                        13858,
                         "Executing task in folder {0}: {1}",
                         workspaceFolder.name,
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
@@ -1376,7 +1384,7 @@ class TerminalTaskSystem extends Disposable {
                     }) + this.getTaskShellIntegrationOutputSequence(undefined);
                 } else {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        13671,
+                        13860,
                         "Executing task: {0}",
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
                     )), {
@@ -1508,7 +1516,10 @@ class TerminalTaskSystem extends Disposable {
         delete this._sameTaskTerminals[terminalData.lastTask];
         this._idleTaskTerminals.delete(terminalData.lastTask);
         const mapKey = terminalData.lastTask;
-        this._removeFromActiveTasks(mapKey);
+        const cur = this._activeTasks[mapKey];
+        if (cur && cur.terminal === terminal) {
+            this._removeFromActiveTasks(mapKey);
+        }
         if (this._busyTasks[mapKey]) {
             delete this._busyTasks[mapKey];
         }
@@ -1529,7 +1540,7 @@ class TerminalTaskSystem extends Disposable {
                 customPtyImplementation: (id, cols, rows) => ( new TerminalProcessExtHostProxy(id, cols, rows, this._terminalService)),
                 waitOnExit,
                 name: this._createTerminalName(task),
-                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localize(13672, "Executing task: {0}", task._label)), {
+                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localize(13861, "Executing task: {0}", task._label)), {
                     excludeLeadingNewLine: true
                 }) : undefined,
                 isFeatureTerminal: true,
@@ -1552,7 +1563,7 @@ class TerminalTaskSystem extends Disposable {
                 presentationOptions
             );
             if (launchConfigs === undefined) {
-                return [undefined, ( new TaskError(Severity.Error, ( localize(13673, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
+                return [undefined, ( new TaskError(Severity.Error, ( localize(13862, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
             }
         }
         const prefersSameTerminal = presentationOptions.panel === PanelKind.Dedicated;
@@ -1860,7 +1871,7 @@ class TerminalTaskSystem extends Disposable {
             }
             if (!matcher) {
                 this._appendOutput(( localize(
-                    13674,
+                    13863,
                     "Problem matcher {0} can't be resolved. The matcher will be ignored"
                 )));
                 continue;
@@ -1988,9 +1999,9 @@ function getWaitOnExitValue(presentationOptions, configurationProperties) {
     if ((presentationOptions.close === undefined) || (presentationOptions.close === false)) {
         if ((presentationOptions.reveal !== RevealKind.Never) || !configurationProperties.isBackground || (presentationOptions.close === false)) {
             if (presentationOptions.panel === PanelKind.New) {
-                return taskShellIntegrationWaitOnExitSequence(( localize(13675, "Press any key to close the terminal.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(13864, "Press any key to close the terminal.")));
             } else if (presentationOptions.showReuseMessage) {
-                return taskShellIntegrationWaitOnExitSequence(( localize(13676, "Terminal will be reused by tasks, press any key to close it.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(13865, "Terminal will be reused by tasks, press any key to close it.")));
             } else {
                 return true;
             }

package/vscode/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.js

@@ -10,12 +10,12 @@ const schema = {
         },
         options: {
             type: "object",
-            description: ( localize(13678, "Additional command options")),
+            description: ( localize(13867, "Additional command options")),
             properties: {
                 cwd: {
                     type: "string",
                     description: ( localize(
-                        13679,
+                        13868,
                         "The current working directory of the executed program or script. If omitted Code's current workspace root is used."
                     ))
                 },
@@ -25,7 +25,7 @@ const schema = {
                         type: "string"
                     },
                     description: ( localize(
-                        13680,
+                        13869,
                         "The environment of the executed program or shell. If omitted the parent process' environment is used."
                     ))
                 }
@@ -38,7 +38,7 @@ const schema = {
             oneOf: [{
                 type: "string",
                 errorMessage: ( localize(
-                    13681,
+                    13870,
                     "Unrecognized problem matcher. Is the extension that contributes this problem matcher installed?"
                 ))
             }, Schemas.LegacyProblemMatcher, {
@@ -47,7 +47,7 @@ const schema = {
                     anyOf: [{
                         type: "string",
                         errorMessage: ( localize(
-                            13681,
+                            13870,
                             "Unrecognized problem matcher. Is the extension that contributes this problem matcher installed?"
                         ))
                     }, Schemas.LegacyProblemMatcher]
@@ -57,15 +57,15 @@ const schema = {
         shellConfiguration: {
             type: "object",
             additionalProperties: false,
-            description: ( localize(13682, "Configures the shell to be used.")),
+            description: ( localize(13871, "Configures the shell to be used.")),
             properties: {
                 executable: {
                     type: "string",
-                    description: ( localize(13683, "The shell to be used."))
+                    description: ( localize(13872, "The shell to be used."))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13684, "The shell arguments.")),
+                    description: ( localize(13873, "The shell arguments.")),
                     items: {
                         type: "string"
                     }
@@ -79,13 +79,13 @@ const schema = {
                 command: {
                     type: "string",
                     description: ( localize(
-                        13685,
+                        13874,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13686, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(13875, "Arguments passed to the command when this task is invoked.")),
                     items: {
                         type: "string"
                     }
@@ -102,18 +102,18 @@ const schema = {
             properties: {
                 taskName: {
                     type: "string",
-                    description: ( localize(13687, "The task's name"))
+                    description: ( localize(13876, "The task's name"))
                 },
                 command: {
                     type: "string",
                     description: ( localize(
-                        13685,
+                        13874,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13686, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(13875, "Arguments passed to the command when this task is invoked.")),
                     items: {
                         type: "string"
                     }
@@ -124,13 +124,13 @@ const schema = {
                 windows: {
                     anyOf: [{
                         $ref: "#/definitions/commandConfiguration",
-                        description: ( localize(13688, "Windows specific command configuration"))
+                        description: ( localize(13877, "Windows specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13689,
+                                    13878,
                                     "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
                                 ))
                             }
@@ -140,13 +140,13 @@ const schema = {
                 osx: {
                     anyOf: [{
                         $ref: "#/definitions/commandConfiguration",
-                        description: ( localize(13690, "Mac specific command configuration"))
+                        description: ( localize(13879, "Mac specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13689,
+                                    13878,
                                     "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
                                 ))
                             }
@@ -156,13 +156,13 @@ const schema = {
                 linux: {
                     anyOf: [{
                         $ref: "#/definitions/commandConfiguration",
-                        description: ( localize(13691, "Linux specific command configuration"))
+                        description: ( localize(13880, "Linux specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13689,
+                                    13878,
                                     "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
                                 ))
                             }
@@ -172,7 +172,7 @@ const schema = {
                 suppressTaskName: {
                     type: "boolean",
                     description: ( localize(
-                        13692,
+                        13881,
                         "Controls whether the task name is added as an argument to the command. If omitted the globally defined value is used."
                     )),
                     default: true
@@ -180,23 +180,23 @@ const schema = {
                 showOutput: {
                     $ref: "#/definitions/showOutputType",
                     description: ( localize(
-                        13693,
+                        13882,
                         "Controls whether the output of the running task is shown or not. If omitted the globally defined value is used."
                     ))
                 },
                 echoCommand: {
                     type: "boolean",
                     description: ( localize(
-                        13694,
+                        13883,
                         "Controls whether the executed command is echoed to the output. Default is false."
                     )),
                     default: true
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(13695, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(13884, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        13696,
+                        13885,
                         "Whether the executed task is kept alive and is watching the file system."
                     )),
                     default: true
@@ -204,7 +204,7 @@ const schema = {
                 isBackground: {
                     type: "boolean",
                     description: ( localize(
-                        13697,
+                        13886,
                         "Whether the executed task is kept alive and is running in the background."
                     )),
                     default: true
@@ -212,25 +212,25 @@ const schema = {
                 promptOnClose: {
                     type: "boolean",
                     description: ( localize(
-                        13698,
+                        13887,
                         "Whether the user is prompted when VS Code closes with a running task."
                     )),
                     default: false
                 },
                 isBuildCommand: {
                     type: "boolean",
-                    description: ( localize(13699, "Maps this task to Code's default build command.")),
+                    description: ( localize(13888, "Maps this task to Code's default build command.")),
                     default: true
                 },
                 isTestCommand: {
                     type: "boolean",
-                    description: ( localize(13700, "Maps this task to Code's default test command.")),
+                    description: ( localize(13889, "Maps this task to Code's default test command.")),
                     default: true
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        13689,
+                        13878,
                         "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
                     ))
                 }
@@ -243,13 +243,13 @@ const schema = {
                 command: {
                     type: "string",
                     description: ( localize(
-                        13685,
+                        13874,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13701, "Additional arguments passed to the command.")),
+                    description: ( localize(13890, "Additional arguments passed to the command.")),
                     items: {
                         type: "string"
                     }
@@ -260,15 +260,15 @@ const schema = {
                 showOutput: {
                     $ref: "#/definitions/showOutputType",
                     description: ( localize(
-                        13702,
+                        13891,
                         "Controls whether the output of the running task is shown or not. If omitted 'always' is used."
                     ))
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(13703, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(13892, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        13704,
+                        13893,
                         "Whether the executed task is kept alive and is watching the file system."
                     )),
                     default: true
@@ -276,7 +276,7 @@ const schema = {
                 isBackground: {
                     type: "boolean",
                     description: ( localize(
-                        13705,
+                        13894,
                         "Whether the executed task is kept alive and is running in the background."
                     )),
                     default: true
@@ -284,7 +284,7 @@ const schema = {
                 promptOnClose: {
                     type: "boolean",
                     description: ( localize(
-                        13706,
+                        13895,
                         "Whether the user is prompted when VS Code closes with a running background task."
                     )),
                     default: false
@@ -292,7 +292,7 @@ const schema = {
                 echoCommand: {
                     type: "boolean",
                     description: ( localize(
-                        13694,
+                        13883,
                         "Controls whether the executed command is echoed to the output. Default is false."
                     )),
                     default: true
@@ -300,26 +300,26 @@ const schema = {
                 suppressTaskName: {
                     type: "boolean",
                     description: ( localize(
-                        13707,
+                        13896,
                         "Controls whether the task name is added as an argument to the command. Default is false."
                     )),
                     default: true
                 },
                 taskSelector: {
                     type: "string",
-                    description: ( localize(13708, "Prefix to indicate that an argument is task."))
+                    description: ( localize(13897, "Prefix to indicate that an argument is task."))
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        13709,
+                        13898,
                         "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
                     ))
                 },
                 tasks: {
                     type: "array",
                     description: ( localize(
-                        13710,
+                        13899,
                         "The task configurations. Usually these are enrichments of task already defined in the external task runner."
                     )),
                     items: {

package/vscode/src/vs/workbench/contrib/tasks/common/jsonSchema_v1.js

@@ -13,32 +13,32 @@ const schema = {
                 version: {
                     type: "string",
                     enum: ["0.1.0"],
-                    deprecationMessage: ( localize(13711, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
-                    description: ( localize(13712, "The config's version number"))
+                    deprecationMessage: ( localize(13900, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
+                    description: ( localize(13901, "The config's version number"))
                 },
                 _runner: {
-                    deprecationMessage: ( localize(13713, "The runner has graduated. Use the official runner property"))
+                    deprecationMessage: ( localize(13902, "The runner has graduated. Use the official runner property"))
                 },
                 runner: {
                     type: "string",
                     enum: ["process", "terminal"],
                     default: "process",
                     description: ( localize(
-                        13714,
+                        13903,
                         "Defines whether the task is executed as a process and the output is shown in the output window or inside the terminal."
                     ))
                 },
                 windows: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(13715, "Windows specific command configuration"))
+                    description: ( localize(13904, "Windows specific command configuration"))
                 },
                 osx: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(13716, "Mac specific command configuration"))
+                    description: ( localize(13905, "Mac specific command configuration"))
                 },
                 linux: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(13717, "Linux specific command configuration"))
+                    description: ( localize(13906, "Linux specific command configuration"))
                 }
             }
         }, {
@@ -50,7 +50,7 @@ const shellCommand = {
     type: "boolean",
     default: true,
     description: ( localize(
-        13718,
+        13907,
         "Specifies whether the command is a shell command or an external program. Defaults to false if omitted."
     ))
 };