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

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

@@ -32,25 +32,25 @@ const shellCommand = {
         type: "boolean",
         default: true,
         description: ( localize(
-            13076,
+            13141,
             "Specifies whether the command is a shell command or an external program. Defaults to false if omitted."
         ))
     }, {
         $ref: "#/definitions/shellConfiguration"
     }],
     deprecationMessage: ( localize(
-        13077,
+        13142,
         "The property isShellCommand is deprecated. Use the type property of the task and the shell property in the options instead. See also the 1.14 release notes."
     ))
 };
 const hide = {
     type: "boolean",
-    description: ( localize(13078, "Hide this task from the run task quick pick")),
+    description: ( localize(13143, "Hide this task from the run task quick pick")),
     default: true
 };
 const inSessions = {
     type: "boolean",
-    description: ( localize(13079, "Show this task in the Agent Sessions run action dropdown")),
+    description: ( localize(13144, "Show this task in the Agent Sessions run action dropdown")),
     default: false
 };
 const taskIdentifier = {
@@ -59,17 +59,17 @@ const taskIdentifier = {
     properties: {
         type: {
             type: "string",
-            description: ( localize(13080, "The task identifier."))
+            description: ( localize(13145, "The task identifier."))
         }
     }
 };
 const dependsOn = {
     anyOf: [{
         type: "string",
-        description: ( localize(13081, "Another task this task depends on."))
+        description: ( localize(13146, "Another task this task depends on."))
     }, taskIdentifier, {
         type: "array",
-        description: ( localize(13082, "The other tasks this task depends on.")),
+        description: ( localize(13147, "The other tasks this task depends on.")),
         items: {
             anyOf: [{
                 type: "string"
@@ -77,39 +77,39 @@ const dependsOn = {
         }
     }],
     description: ( localize(
-        13083,
+        13148,
         "Either a string representing another task or an array of other tasks that this task depends on."
     ))
 };
 const dependsOrder = {
     type: "string",
     enum: ["parallel", "sequence"],
-    enumDescriptions: [( localize(13084, "Run all dependsOn tasks in parallel.")), ( localize(13085, "Run all dependsOn tasks in sequence."))],
+    enumDescriptions: [( localize(13149, "Run all dependsOn tasks in parallel.")), ( localize(13150, "Run all dependsOn tasks in sequence."))],
     default: "parallel",
     description: ( localize(
-        13086,
+        13151,
         "Determines the order of the dependsOn tasks for this task. Note that this property is not recursive."
     ))
 };
 const detail = {
     type: "string",
     description: ( localize(
-        13087,
+        13152,
         "An optional description of a task that shows in the Run Task quick pick as a detail."
     ))
 };
 const icon = {
     type: "object",
-    description: ( localize(13088, "An optional icon for the task")),
+    description: ( localize(13153, "An optional icon for the task")),
     properties: {
         id: {
-            description: ( localize(13089, "An optional codicon ID to use")),
+            description: ( localize(13154, "An optional codicon ID to use")),
             type: ["string", "null"],
             enum: Array.from(getAllCodicons(), icon => icon.id),
             markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`)
         },
         color: {
-            description: ( localize(13090, "An optional color of the icon")),
+            description: ( localize(13155, "An optional color of the icon")),
             type: ["string", "null"],
             enum: [
                 "terminal.ansiBlack",
@@ -135,7 +135,7 @@ const presentation = {
         clear: false
     },
     description: ( localize(
-        13091,
+        13156,
         "Configures the panel that is used to present the task's output and reads its input."
     )),
     additionalProperties: false,
@@ -144,7 +144,7 @@ const presentation = {
             type: "boolean",
             default: true,
             description: ( localize(
-                13092,
+                13157,
                 "Controls whether the executed command is echoed to the panel. Default is true."
             ))
         },
@@ -152,30 +152,30 @@ const presentation = {
             type: "boolean",
             default: false,
             description: ( localize(
-                13093,
+                13158,
                 "Controls whether the panel takes focus. Default is false. If set to true the panel is revealed as well."
             ))
         },
         revealProblems: {
             type: "string",
             enum: ["always", "onProblem", "never"],
-            enumDescriptions: [( localize(13094, "Always reveals the problems panel when this task is executed.")), ( localize(13095, "Only reveals the problems panel if a problem is found.")), ( localize(13096, "Never reveals the problems panel when this task is executed."))],
+            enumDescriptions: [( localize(13159, "Always reveals the problems panel when this task is executed.")), ( localize(13160, "Only reveals the problems panel if a problem is found.")), ( localize(13161, "Never reveals the problems panel when this task is executed."))],
             default: "never",
             description: ( localize(
-                13097,
+                13162,
                 "Controls whether the problems panel is revealed when running this task or not. Takes precedence over option \"reveal\". Default is \"never\"."
             ))
         },
         reveal: {
             type: "string",
             enum: ["always", "silent", "never"],
-            enumDescriptions: [( localize(13098, "Always reveals the terminal when this task is executed.")), ( localize(
-                13099,
+            enumDescriptions: [( localize(13163, "Always reveals the terminal when this task is executed.")), ( localize(
+                13164,
                 "Only reveals the terminal if the task exits with an error or the problem matcher finds an error."
-            )), ( localize(13100, "Never reveals the terminal when this task is executed."))],
+            )), ( localize(13165, "Never reveals the terminal when this task is executed."))],
             default: "always",
             description: ( localize(
-                13101,
+                13166,
                 "Controls whether the terminal running the task is revealed or not. May be overridden by option \"revealProblems\". Default is \"always\"."
             ))
         },
@@ -184,7 +184,7 @@ const presentation = {
             enum: ["shared", "dedicated", "new"],
             default: "shared",
             description: ( localize(
-                13102,
+                13167,
                 "Controls if the panel is shared between tasks, dedicated to this task or a new one is created on every run."
             ))
         },
@@ -192,7 +192,7 @@ const presentation = {
             type: "boolean",
             default: true,
             description: ( localize(
-                13103,
+                13168,
                 "Controls whether to show the `Terminal will be reused by tasks, press any key to close it` message."
             ))
         },
@@ -200,21 +200,21 @@ const presentation = {
             type: "boolean",
             default: false,
             description: ( localize(
-                13104,
+                13169,
                 "Controls whether the terminal is cleared before executing the task."
             ))
         },
         group: {
             type: "string",
             description: ( localize(
-                13105,
+                13170,
                 "Controls whether the task is executed in a specific terminal group using split panes."
             ))
         },
         close: {
             type: "boolean",
             description: ( localize(
-                13106,
+                13171,
                 "Controls whether the terminal the task runs in is closed when the task exits."
             ))
         },
@@ -222,25 +222,25 @@ const presentation = {
             type: "boolean",
             default: false,
             description: ( localize(
-                13107,
+                13172,
                 "Controls whether to preserve the task name in the terminal after task completion."
             ))
         }
     }
 };
 const terminal = deepClone(presentation);
-terminal.deprecationMessage = ( localize(13108, "The terminal property is deprecated. Use presentation instead"));
+terminal.deprecationMessage = ( localize(13173, "The terminal property is deprecated. Use presentation instead"));
 const groupStrings = {
     type: "string",
     enum: ["build", "test", "none"],
     enumDescriptions: [( localize(
-        13109,
+        13174,
         "Marks the task as a build task accessible through the 'Run Build Task' command."
     )), ( localize(
-        13110,
+        13175,
         "Marks the task as a test task accessible through the 'Run Test Task' command."
-    )), ( localize(13111, "Assigns the task to no group"))],
-    description: ( localize(13112, "The task's execution group."))
+    )), ( localize(13176, "Assigns the task to no group"))],
+    description: ( localize(13177, "The task's execution group."))
 };
 const group = {
     oneOf: [groupStrings, {
@@ -251,7 +251,7 @@ const group = {
                 type: ["boolean", "string"],
                 default: false,
                 description: ( localize(
-                    13113,
+                    13178,
                     "Defines if this task is the default task in the group, or a glob to match the file which should trigger this task."
                 ))
             }
@@ -262,16 +262,16 @@ const group = {
             kind: "build",
             isDefault: true
         },
-        description: ( localize(13114, "Marks the task as the default build task."))
+        description: ( localize(13179, "Marks the task as the default build task."))
     }, {
         body: {
             kind: "test",
             isDefault: true
         },
-        description: ( localize(13115, "Marks the task as the default test task."))
+        description: ( localize(13180, "Marks the task as the default test task."))
     }],
     description: ( localize(
-        13116,
+        13181,
         "Defines to which execution group this task belongs to. It supports \"build\" to add it to the build group and \"test\" to add it to the test group."
     ))
 };
@@ -280,7 +280,7 @@ const taskType = {
     enum: ["shell"],
     default: "process",
     description: ( localize(
-        13117,
+        13182,
         "Defines whether the task is run as a process or as a command inside a shell."
     ))
 };
@@ -294,7 +294,7 @@ const command = {
                 type: "string"
             },
             description: ( localize(
-                13118,
+                13183,
                 "The shell command to be executed. Array items will be joined using a space character"
             ))
         }]
@@ -311,32 +311,32 @@ const command = {
                         type: "string"
                     },
                     description: ( localize(
-                        13118,
+                        13183,
                         "The shell command to be executed. Array items will be joined using a space character"
                     ))
                 }],
-                description: ( localize(13119, "The actual command value"))
+                description: ( localize(13184, "The actual command value"))
             },
             quoting: {
                 type: "string",
                 enum: ["escape", "strong", "weak"],
                 enumDescriptions: [( localize(
-                    13120,
+                    13185,
                     "Escapes characters using the shell's escape character (e.g. ` under PowerShell and \\ under bash)."
                 )), ( localize(
-                    13121,
+                    13186,
                     "Quotes the argument using the shell's strong quote character (e.g. ' under PowerShell and bash)."
                 )), ( localize(
-                    13122,
+                    13187,
                     "Quotes the argument using the shell's weak quote character (e.g. \" under PowerShell and bash)."
                 ))],
                 default: "strong",
-                description: ( localize(13123, "How the command value should be quoted."))
+                description: ( localize(13188, "How the command value should be quoted."))
             }
         }
     }],
     description: ( localize(
-        13124,
+        13189,
         "The command to be executed. Can be an external program or a shell command."
     ))
 };
@@ -351,46 +351,46 @@ const args = {
             properties: {
                 value: {
                     type: "string",
-                    description: ( localize(13125, "The actual argument value"))
+                    description: ( localize(13190, "The actual argument value"))
                 },
                 quoting: {
                     type: "string",
                     enum: ["escape", "strong", "weak"],
                     enumDescriptions: [( localize(
-                        13120,
+                        13185,
                         "Escapes characters using the shell's escape character (e.g. ` under PowerShell and \\ under bash)."
                     )), ( localize(
-                        13121,
+                        13186,
                         "Quotes the argument using the shell's strong quote character (e.g. ' under PowerShell and bash)."
                     )), ( localize(
-                        13122,
+                        13187,
                         "Quotes the argument using the shell's weak quote character (e.g. \" under PowerShell and bash)."
                     ))],
                     default: "strong",
-                    description: ( localize(13126, "How the argument value should be quoted."))
+                    description: ( localize(13191, "How the argument value should be quoted."))
                 }
             }
         }]
     },
-    description: ( localize(13127, "Arguments passed to the command when this task is invoked."))
+    description: ( localize(13192, "Arguments passed to the command when this task is invoked."))
 };
 const label = {
     type: "string",
-    description: ( localize(13128, "The task's user interface label"))
+    description: ( localize(13193, "The task's user interface label"))
 };
 const version = {
     type: "string",
     enum: ["2.0.0"],
-    description: ( localize(13129, "The config's version number."))
+    description: ( localize(13194, "The config's version number."))
 };
 const identifier = {
     type: "string",
     description: ( localize(
-        13130,
+        13195,
         "A user defined identifier to reference the task in launch.json or a dependsOn clause."
     )),
     deprecationMessage: ( localize(
-        13131,
+        13196,
         "User defined identifiers are deprecated. For custom task use the name as a reference and for tasks provided by extensions use their defined task identifier."
     ))
 };
@@ -400,14 +400,14 @@ const runOptions = {
     properties: {
         reevaluateOnRerun: {
             type: "boolean",
-            description: ( localize(13132, "Whether to reevaluate task variables on rerun.")),
+            description: ( localize(13197, "Whether to reevaluate task variables on rerun.")),
             default: true
         },
         runOn: {
             type: "string",
             enum: ["default", "folderOpen", "worktreeCreated"],
             description: ( localize(
-                13133,
+                13198,
                 "Configures when the task should be run. If set to folderOpen, then the task will be run automatically when the folder is opened. If set to worktreeCreated, then the task will be run automatically when an Agent Session worktree is created."
             )),
             default: "default"
@@ -415,7 +415,7 @@ const runOptions = {
         instanceLimit: {
             type: "number",
             description: ( localize(
-                13134,
+                13199,
                 "The number of instances of the task that are allowed to run simultaneously."
             )),
             default: 1
@@ -423,12 +423,12 @@ const runOptions = {
         instancePolicy: {
             type: "string",
             enum: ["terminateNewest", "terminateOldest", "prompt", "warn", "silent"],
-            enumDescriptions: [( localize(13135, "Terminates the newest instance.")), ( localize(13136, "Terminates the oldest instance.")), ( localize(13137, "Asks which instance to terminate.")), ( localize(13138, "Does nothing but warns that the instance limit has been reached.")), ( localize(13139, "Does nothing."))],
-            description: ( localize(13140, "Policy to apply when instance limit is reached.")),
+            enumDescriptions: [( localize(13200, "Terminates the newest instance.")), ( localize(13201, "Terminates the oldest instance.")), ( localize(13202, "Asks which instance to terminate.")), ( localize(13203, "Does nothing but warns that the instance limit has been reached.")), ( localize(13204, "Does nothing."))],
+            description: ( localize(13205, "Policy to apply when instance limit is reached.")),
             default: "prompt"
         }
     },
-    description: ( localize(13141, "The task's run related options"))
+    description: ( localize(13206, "The task's run related options"))
 };
 const commonSchemaDefinitions = schema$1.definitions;
 const options = deepClone(commonSchemaDefinitions.options);
@@ -440,13 +440,13 @@ const taskConfiguration = {
     properties: {
         label: {
             type: "string",
-            description: ( localize(13142, "The task's label"))
+            description: ( localize(13207, "The task's label"))
         },
         taskName: {
             type: "string",
-            description: ( localize(13143, "The task's name")),
+            description: ( localize(13208, "The task's name")),
             deprecationMessage: ( localize(
-                13144,
+                13209,
                 "The task's name property is deprecated. Use the label property instead."
             ))
         },
@@ -455,7 +455,7 @@ const taskConfiguration = {
         isBackground: {
             type: "boolean",
             description: ( localize(
-                13145,
+                13210,
                 "Whether the executed task is kept alive and is running in the background."
             )),
             default: true
@@ -463,7 +463,7 @@ const taskConfiguration = {
         promptOnClose: {
             type: "boolean",
             description: ( localize(
-                13146,
+                13211,
                 "Whether the user is prompted when VS Code closes with a running task."
             )),
             default: false
@@ -476,7 +476,7 @@ const taskConfiguration = {
         problemMatcher: {
             $ref: "#/definitions/problemMatcherType",
             description: ( localize(
-                13147,
+                13212,
                 "The problem matcher(s) to use. Can either be a string or a problem matcher definition or an array of strings and problem matchers."
             ))
         },
@@ -501,7 +501,7 @@ function updateTaskDefinitions() {
         const schemaProperties = schema.properties;
         schemaProperties.type = {
             type: "string",
-            description: ( localize(13148, "The task type to customize")),
+            description: ( localize(13213, "The task type to customize")),
             enum: [taskType.taskType]
         };
         if (taskType.required) {
@@ -524,7 +524,7 @@ const customize = deepClone(taskConfiguration);
 customize.properties.customize = {
     type: "string",
     deprecationMessage: ( localize(
-        13149,
+        13214,
         "The customize property is deprecated. See the 1.14 release notes on how to migrate to the new task customization approach"
     ))
 };
@@ -554,7 +554,7 @@ taskDescriptionProperties.group = deepClone(group);
 taskDescriptionProperties.runOptions = deepClone(runOptions);
 taskDescriptionProperties.detail = detail;
 taskDescriptionProperties.taskName.deprecationMessage = ( localize(
-    13144,
+    13209,
     "The task's name property is deprecated. Use the label property instead."
 ));
 const processTask = deepClone(taskDescription);
@@ -565,23 +565,23 @@ taskDescription.default = {
     problemMatcher: []
 };
 definitions.showOutputType.deprecationMessage = ( localize(
-    13150,
+    13215,
     "The property showOutput is deprecated. Use the reveal property inside the presentation property instead. See also the 1.14 release notes."
 ));
 taskDescriptionProperties.echoCommand.deprecationMessage = ( localize(
-    13151,
+    13216,
     "The property echoCommand is deprecated. Use the echo property inside the presentation property instead. See also the 1.14 release notes."
 ));
 taskDescriptionProperties.suppressTaskName.deprecationMessage = ( localize(
-    13152,
+    13217,
     "The property suppressTaskName is deprecated. Inline the command with its arguments into the task instead. See also the 1.14 release notes."
 ));
 taskDescriptionProperties.isBuildCommand.deprecationMessage = ( localize(
-    13153,
+    13218,
     "The property isBuildCommand is deprecated. Use the group property instead. See also the 1.14 release notes."
 ));
 taskDescriptionProperties.isTestCommand.deprecationMessage = ( localize(
-    13154,
+    13219,
     "The property isTestCommand is deprecated. Use the group property instead. See also the 1.14 release notes."
 ));
 processTask.properties.type = {
@@ -589,7 +589,7 @@ processTask.properties.type = {
     enum: ["process"],
     default: "process",
     description: ( localize(
-        13117,
+        13182,
         "Defines whether the task is run as a process or as a command inside a shell."
     ))
 };
@@ -615,11 +615,11 @@ definitionsTaskRunnerConfigurationProperties.type = deepClone(taskType);
 definitionsTaskRunnerConfigurationProperties.group = deepClone(group);
 definitionsTaskRunnerConfigurationProperties.presentation = deepClone(presentation);
 definitionsTaskRunnerConfigurationProperties.suppressTaskName.deprecationMessage = ( localize(
-    13152,
+    13217,
     "The property suppressTaskName is deprecated. Inline the command with its arguments into the task instead. See also the 1.14 release notes."
 ));
 definitionsTaskRunnerConfigurationProperties.taskSelector.deprecationMessage = ( localize(
-    13155,
+    13220,
     "The property taskSelector is deprecated. Inline the command with its arguments into the task instead. See also the 1.14 release notes."
 ));
 const osSpecificTaskRunnerConfiguration = deepClone(definitions.taskRunnerConfiguration);
@@ -636,15 +636,15 @@ const schema = {
                 version: deepClone(version),
                 windows: {
                     "$ref": "#/definitions/osSpecificTaskRunnerConfiguration",
-                    "description": ( localize(13156, "Windows specific command configuration"))
+                    "description": ( localize(13221, "Windows specific command configuration"))
                 },
                 osx: {
                     "$ref": "#/definitions/osSpecificTaskRunnerConfiguration",
-                    "description": ( localize(13157, "Mac specific command configuration"))
+                    "description": ( localize(13222, "Mac specific command configuration"))
                 },
                 linux: {
                     "$ref": "#/definitions/osSpecificTaskRunnerConfiguration",
-                    "description": ( localize(13158, "Linux specific command configuration"))
+                    "description": ( localize(13223, "Linux specific command configuration"))
                 }
             }
         }, {

package/vscode/src/vs/workbench/contrib/tasks/common/problemCollectors.d.ts

@@ -13,6 +13,7 @@ export declare enum ProblemCollectorEventKind {
 }
 export interface IProblemCollectorEvent {
     kind: ProblemCollectorEventKind;
+    capturedVariables?: ReadonlyMap<string, string>;
 }
 export interface IProblemMatcher {
     processLine(line: string): void;

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

@@ -14,9 +14,10 @@ var ProblemCollectorEventKind;
 })(ProblemCollectorEventKind || (ProblemCollectorEventKind = {}));
 var IProblemCollectorEvent;
 (function(IProblemCollectorEvent) {
-    function create(kind) {
+    function create(kind, capturedVariables) {
         return ( Object.freeze({
-            kind
+            kind,
+            capturedVariables
         }));
     }
     IProblemCollectorEvent.create = create;
@@ -482,8 +483,9 @@ class WatchingProblemCollector extends AbstractProblemCollector {
                 }
                 if (this._activeBackgroundMatchers.delete(background.key)) {
                     this.resetCurrentResource();
+                    const capturedVariables = matches.groups ? ( new Map(Object.entries(matches.groups))) : undefined;
                     this._onDidStateChange.fire(
-                        IProblemCollectorEvent.create(ProblemCollectorEventKind.BackgroundProcessingEnds)
+                        IProblemCollectorEvent.create(ProblemCollectorEventKind.BackgroundProcessingEnds, capturedVariables)
                     );
                     result = true;
                     this.lines.push(line);