@codingame/monaco-vscode-task-service-override 29.1.1 → 30.0.0

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

@@ -170,10 +170,11 @@ class TerminalTaskSystem extends Disposable {
         this._hasReconnected = false;
         this._terminalTabActions = [{
             id: RerunForActiveTerminalCommandId,
-            label: ( localize(13020, "Rerun Task")),
+            label: ( localize(13085, "Rerun Task")),
             icon: rerunTaskIcon
         }];
         this._taskStartTimes = ( new Map());
+        this._capturedTaskVariables = ( new Map());
         this._activeTasks = Object.create(null);
         this._busyTasks = Object.create(null);
         this._taskErrors = Object.create(null);
@@ -249,7 +250,7 @@ class TerminalTaskSystem extends Disposable {
             } else {
                 this._log(( error.toString()));
                 throw ( new TaskError(Severity.Error, ( localize(
-                    13021,
+                    13086,
                     "A unknown error has occurred while executing a task. See task output log for details."
                 )), TaskErrors.UnknownError));
             }
@@ -297,7 +298,7 @@ class TerminalTaskSystem extends Disposable {
             });
             const openOutput = "Show Output";
             this._notificationService.prompt(Severity.Warning, ( localize(
-                13022,
+                13087,
                 "There are issues with task \"{0}\". See the output for more details.",
                 task._label
             )), [{
@@ -465,7 +466,7 @@ class TerminalTaskSystem extends Disposable {
         return Promise.all(promises);
     }
     _showDependencyCycleMessage(task) {
-        this._log(( localize(13023, "There is a dependency cycle. See task \"{0}\".", task._label)));
+        this._log(( localize(13088, "There is a dependency cycle. See task \"{0}\".", task._label)));
         this._showOutput();
     }
     _executeTask(
@@ -528,7 +529,7 @@ class TerminalTaskSystem extends Disposable {
                         }
                     } else {
                         this._log(( localize(
-                            13024,
+                            13089,
                             "Couldn't resolve dependent task '{0}' in workspace folder '{1}'",
                             isString(dependency.task) ? dependency.task : JSON.stringify(dependency.task, undefined, 0),
                             (dependency.uri.toString())
@@ -882,7 +883,7 @@ class TerminalTaskSystem extends Disposable {
             ));
             if ((problemMatchers.length > 0) && !watchingProblemMatcher.isWatching()) {
                 this._appendOutput(( localize(
-                    13025,
+                    13090,
                     "Task {0} is a background task but uses a problem matcher without a background pattern",
                     task._label
                 )));
@@ -901,6 +902,9 @@ class TerminalTaskSystem extends Disposable {
                     if (this._busyTasks[mapKey]) {
                         delete this._busyTasks[mapKey];
                     }
+                    if (event.capturedVariables) {
+                        this._registerCapturedVariables(event.capturedVariables);
+                    }
                     this._fireTaskEvent(
                         TaskEvent.inactive(task, terminal?.instanceId, this._takeTaskDuration(terminal?.instanceId))
                     );
@@ -1175,6 +1179,14 @@ class TerminalTaskSystem extends Disposable {
         this._taskStartTimes.delete(terminalId);
         return Date.now() - startTime;
     }
+    _registerCapturedVariables(capturedVariables) {
+        for (const [name, value] of capturedVariables) {
+            this._capturedTaskVariables.set(name, value);
+            if (!( this._configurationResolverService.resolvableVariables.has(`taskVar:${name}`))) {
+                this._configurationResolverService.contributeVariable(`taskVar:${name}`, async () => this._capturedTaskVariables.get(name));
+            }
+        }
+    }
     _createTerminalName(task) {
         const needsFolderQualification = this._contextService.getWorkbenchState() === WorkbenchState.WORKSPACE;
         return needsFolderQualification ? task.getQualifiedLabel() : (task.configurationProperties.name || "");
@@ -1314,11 +1326,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(13026, "Executing task in folder {0}: {1}", folder, commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13091, "Executing task in folder {0}: {1}", folder, commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 } else {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13027, "Executing task: {0}", commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(13092, "Executing task: {0}", commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 }
@@ -1355,7 +1367,7 @@ class TerminalTaskSystem extends Disposable {
                 };
                 if (needsFolderQualification && workspaceFolder) {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        13026,
+                        13091,
                         "Executing task in folder {0}: {1}",
                         workspaceFolder.name,
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
@@ -1364,7 +1376,7 @@ class TerminalTaskSystem extends Disposable {
                     }) + this.getTaskShellIntegrationOutputSequence(undefined);
                 } else {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        13028,
+                        13093,
                         "Executing task: {0}",
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
                     )), {
@@ -1517,7 +1529,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(13029, "Executing task: {0}", task._label)), {
+                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localize(13094, "Executing task: {0}", task._label)), {
                     excludeLeadingNewLine: true
                 }) : undefined,
                 isFeatureTerminal: true,
@@ -1540,7 +1552,7 @@ class TerminalTaskSystem extends Disposable {
                 presentationOptions
             );
             if (launchConfigs === undefined) {
-                return [undefined, ( new TaskError(Severity.Error, ( localize(13030, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
+                return [undefined, ( new TaskError(Severity.Error, ( localize(13095, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
             }
         }
         const prefersSameTerminal = presentationOptions.panel === PanelKind.Dedicated;
@@ -1848,7 +1860,7 @@ class TerminalTaskSystem extends Disposable {
             }
             if (!matcher) {
                 this._appendOutput(( localize(
-                    13031,
+                    13096,
                     "Problem matcher {0} can't be resolved. The matcher will be ignored"
                 )));
                 continue;
@@ -1976,9 +1988,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(13032, "Press any key to close the terminal.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(13097, "Press any key to close the terminal.")));
             } else if (presentationOptions.showReuseMessage) {
-                return taskShellIntegrationWaitOnExitSequence(( localize(13033, "Terminal will be reused by tasks, press any key to close it.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(13098, "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(13035, "Additional command options")),
+            description: ( localize(13100, "Additional command options")),
             properties: {
                 cwd: {
                     type: "string",
                     description: ( localize(
-                        13036,
+                        13101,
                         "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(
-                        13037,
+                        13102,
                         "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(
-                    13038,
+                    13103,
                     "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(
-                            13038,
+                            13103,
                             "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(13039, "Configures the shell to be used.")),
+            description: ( localize(13104, "Configures the shell to be used.")),
             properties: {
                 executable: {
                     type: "string",
-                    description: ( localize(13040, "The shell to be used."))
+                    description: ( localize(13105, "The shell to be used."))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13041, "The shell arguments.")),
+                    description: ( localize(13106, "The shell arguments.")),
                     items: {
                         type: "string"
                     }
@@ -79,13 +79,13 @@ const schema = {
                 command: {
                     type: "string",
                     description: ( localize(
-                        13042,
+                        13107,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13043, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(13108, "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(13044, "The task's name"))
+                    description: ( localize(13109, "The task's name"))
                 },
                 command: {
                     type: "string",
                     description: ( localize(
-                        13042,
+                        13107,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13043, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(13108, "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(13045, "Windows specific command configuration"))
+                        description: ( localize(13110, "Windows specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13046,
+                                    13111,
                                     "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(13047, "Mac specific command configuration"))
+                        description: ( localize(13112, "Mac specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13046,
+                                    13111,
                                     "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(13048, "Linux specific command configuration"))
+                        description: ( localize(13113, "Linux specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    13046,
+                                    13111,
                                     "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(
-                        13049,
+                        13114,
                         "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(
-                        13050,
+                        13115,
                         "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(
-                        13051,
+                        13116,
                         "Controls whether the executed command is echoed to the output. Default is false."
                     )),
                     default: true
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(13052, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(13117, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        13053,
+                        13118,
                         "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(
-                        13054,
+                        13119,
                         "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(
-                        13055,
+                        13120,
                         "Whether the user is prompted when VS Code closes with a running task."
                     )),
                     default: false
                 },
                 isBuildCommand: {
                     type: "boolean",
-                    description: ( localize(13056, "Maps this task to Code's default build command.")),
+                    description: ( localize(13121, "Maps this task to Code's default build command.")),
                     default: true
                 },
                 isTestCommand: {
                     type: "boolean",
-                    description: ( localize(13057, "Maps this task to Code's default test command.")),
+                    description: ( localize(13122, "Maps this task to Code's default test command.")),
                     default: true
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        13046,
+                        13111,
                         "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(
-                        13042,
+                        13107,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(13058, "Additional arguments passed to the command.")),
+                    description: ( localize(13123, "Additional arguments passed to the command.")),
                     items: {
                         type: "string"
                     }
@@ -260,15 +260,15 @@ const schema = {
                 showOutput: {
                     $ref: "#/definitions/showOutputType",
                     description: ( localize(
-                        13059,
+                        13124,
                         "Controls whether the output of the running task is shown or not. If omitted 'always' is used."
                     ))
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(13060, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(13125, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        13061,
+                        13126,
                         "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(
-                        13062,
+                        13127,
                         "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(
-                        13063,
+                        13128,
                         "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(
-                        13051,
+                        13116,
                         "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(
-                        13064,
+                        13129,
                         "Controls whether the task name is added as an argument to the command. Default is false."
                     )),
                     default: true
                 },
                 taskSelector: {
                     type: "string",
-                    description: ( localize(13065, "Prefix to indicate that an argument is task."))
+                    description: ( localize(13130, "Prefix to indicate that an argument is task."))
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        13066,
+                        13131,
                         "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(
-                        13067,
+                        13132,
                         "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(13068, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
-                    description: ( localize(13069, "The config's version number"))
+                    deprecationMessage: ( localize(13133, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
+                    description: ( localize(13134, "The config's version number"))
                 },
                 _runner: {
-                    deprecationMessage: ( localize(13070, "The runner has graduated. Use the official runner property"))
+                    deprecationMessage: ( localize(13135, "The runner has graduated. Use the official runner property"))
                 },
                 runner: {
                     type: "string",
                     enum: ["process", "terminal"],
                     default: "process",
                     description: ( localize(
-                        13071,
+                        13136,
                         "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(13072, "Windows specific command configuration"))
+                    description: ( localize(13137, "Windows specific command configuration"))
                 },
                 osx: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(13073, "Mac specific command configuration"))
+                    description: ( localize(13138, "Mac specific command configuration"))
                 },
                 linux: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(13074, "Linux specific command configuration"))
+                    description: ( localize(13139, "Linux specific command configuration"))
                 }
             }
         }, {
@@ -50,7 +50,7 @@ const shellCommand = {
     type: "boolean",
     default: true,
     description: ( localize(
-        13075,
+        13140,
         "Specifies whether the command is a shell command or an external program. Defaults to false if omitted."
     ))
 };