@codingame/monaco-vscode-task-service-override 27.0.0 → 28.0.0

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

@@ -15,7 +15,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { Markers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markers/common/markers';
-import { ProblemMatcherRegistry } from '../common/problemMatcher.js';
+import { ProblemMatcherRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/problemMatcher';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -24,7 +24,7 @@ import { formatMessageForTerminal } from '@codingame/monaco-vscode-api/vscode/vs
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { TaskTerminalStatus } from './taskTerminalStatus.js';
 import { WatchingProblemCollector, ProblemCollectorEventKind, StartStopProblemCollector, ProblemHandlingStrategy } from '../common/problemCollectors.js';
-import { GroupKind } from '../common/taskConfiguration.js';
+import { GroupKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskConfiguration';
 import { Triggers, VerifiedTask, TaskExecuteKind, TaskError, TaskErrors } from '../common/taskSystem.js';
 import { TASK_TERMINAL_ACTIVE, InMemoryTask, CustomTask, ContributedTask, TaskEventKind, TaskEvent, DependsOrder, CommandString, RuntimeType, TaskSourceKind, RevealProblemKind, RevealKind, PanelKind, ShellQuoting, TaskScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { VSCodeSequence, VSCodeOscPt, VSCodeOscProperty } from '../../terminal/browser/terminalEscapeSequences.js';
@@ -170,7 +170,7 @@ class TerminalTaskSystem extends Disposable {
         this._hasReconnected = false;
         this._terminalTabActions = [{
             id: RerunForActiveTerminalCommandId,
-            label: ( localize(12575, "Rerun Task")),
+            label: ( localize(12771, "Rerun Task")),
             icon: rerunTaskIcon
         }];
         this._taskStartTimes = ( new Map());
@@ -249,7 +249,7 @@ class TerminalTaskSystem extends Disposable {
             } else {
                 this._log(( error.toString()));
                 throw ( new TaskError(Severity.Error, ( localize(
-                    12576,
+                    12772,
                     "A unknown error has occurred while executing a task. See task output log for details."
                 )), TaskErrors.UnknownError));
             }
@@ -297,7 +297,7 @@ class TerminalTaskSystem extends Disposable {
             });
             const openOutput = "Show Output";
             this._notificationService.prompt(Severity.Warning, ( localize(
-                12577,
+                12773,
                 "There are issues with task \"{0}\". See the output for more details.",
                 task._label
             )), [{
@@ -465,7 +465,7 @@ class TerminalTaskSystem extends Disposable {
         return Promise.all(promises);
     }
     _showDependencyCycleMessage(task) {
-        this._log(( localize(12578, "There is a dependency cycle. See task \"{0}\".", task._label)));
+        this._log(( localize(12774, "There is a dependency cycle. See task \"{0}\".", task._label)));
         this._showOutput();
     }
     _executeTask(
@@ -528,7 +528,7 @@ class TerminalTaskSystem extends Disposable {
                         }
                     } else {
                         this._log(( localize(
-                            12579,
+                            12775,
                             "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 +882,7 @@ class TerminalTaskSystem extends Disposable {
             ));
             if ((problemMatchers.length > 0) && !watchingProblemMatcher.isWatching()) {
                 this._appendOutput(( localize(
-                    12580,
+                    12776,
                     "Task {0} is a background task but uses a problem matcher without a background pattern",
                     task._label
                 )));
@@ -1314,11 +1314,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(12581, "Executing task in folder {0}: {1}", folder, commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(12777, "Executing task in folder {0}: {1}", folder, commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 } else {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(12582, "Executing task: {0}", commandLine)), {
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(12778, "Executing task: {0}", commandLine)), {
                         excludeLeadingNewLine: true
                     }) + this.getTaskShellIntegrationOutputSequence(commandLineInfo);
                 }
@@ -1355,7 +1355,7 @@ class TerminalTaskSystem extends Disposable {
                 };
                 if (needsFolderQualification && workspaceFolder) {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        12581,
+                        12777,
                         "Executing task in folder {0}: {1}",
                         workspaceFolder.name,
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
@@ -1364,7 +1364,7 @@ class TerminalTaskSystem extends Disposable {
                     }) + this.getTaskShellIntegrationOutputSequence(undefined);
                 } else {
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localize(
-                        12583,
+                        12779,
                         "Executing task: {0}",
                         `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
                     )), {
@@ -1517,7 +1517,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(12584, "Executing task: {0}", task._label)), {
+                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localize(12780, "Executing task: {0}", task._label)), {
                     excludeLeadingNewLine: true
                 }) : undefined,
                 isFeatureTerminal: true,
@@ -1540,7 +1540,7 @@ class TerminalTaskSystem extends Disposable {
                 presentationOptions
             );
             if (launchConfigs === undefined) {
-                return [undefined, ( new TaskError(Severity.Error, ( localize(12585, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
+                return [undefined, ( new TaskError(Severity.Error, ( localize(12781, "Can't execute a shell command on an UNC drive using cmd.exe.")), TaskErrors.UnknownError))];
             }
         }
         const prefersSameTerminal = presentationOptions.panel === PanelKind.Dedicated;
@@ -1848,7 +1848,7 @@ class TerminalTaskSystem extends Disposable {
             }
             if (!matcher) {
                 this._appendOutput(( localize(
-                    12586,
+                    12782,
                     "Problem matcher {0} can't be resolved. The matcher will be ignored"
                 )));
                 continue;
@@ -1976,9 +1976,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(12587, "Press any key to close the terminal.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(12783, "Press any key to close the terminal.")));
             } else if (presentationOptions.showReuseMessage) {
-                return taskShellIntegrationWaitOnExitSequence(( localize(12588, "Terminal will be reused by tasks, press any key to close it.")));
+                return taskShellIntegrationWaitOnExitSequence(( localize(12784, "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

@@ -1,6 +1,6 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Schemas } from './problemMatcher.js';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/problemMatcher';
 
 const schema = {
     definitions: {
@@ -10,12 +10,12 @@ const schema = {
         },
         options: {
             type: "object",
-            description: ( localize(12590, "Additional command options")),
+            description: ( localize(12786, "Additional command options")),
             properties: {
                 cwd: {
                     type: "string",
                     description: ( localize(
-                        12591,
+                        12787,
                         "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(
-                        12592,
+                        12788,
                         "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(
-                    12593,
+                    12789,
                     "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(
-                            12593,
+                            12789,
                             "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(12594, "Configures the shell to be used.")),
+            description: ( localize(12790, "Configures the shell to be used.")),
             properties: {
                 executable: {
                     type: "string",
-                    description: ( localize(12595, "The shell to be used."))
+                    description: ( localize(12791, "The shell to be used."))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(12596, "The shell arguments.")),
+                    description: ( localize(12792, "The shell arguments.")),
                     items: {
                         type: "string"
                     }
@@ -79,13 +79,13 @@ const schema = {
                 command: {
                     type: "string",
                     description: ( localize(
-                        12597,
+                        12793,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(12598, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(12794, "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(12599, "The task's name"))
+                    description: ( localize(12795, "The task's name"))
                 },
                 command: {
                     type: "string",
                     description: ( localize(
-                        12597,
+                        12793,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(12598, "Arguments passed to the command when this task is invoked.")),
+                    description: ( localize(12794, "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(12600, "Windows specific command configuration"))
+                        description: ( localize(12796, "Windows specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    12601,
+                                    12797,
                                     "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(12602, "Mac specific command configuration"))
+                        description: ( localize(12798, "Mac specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    12601,
+                                    12797,
                                     "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(12603, "Linux specific command configuration"))
+                        description: ( localize(12799, "Linux specific command configuration"))
                     }, {
                         properties: {
                             problemMatcher: {
                                 $ref: "#/definitions/problemMatcherType",
                                 description: ( localize(
-                                    12601,
+                                    12797,
                                     "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(
-                        12604,
+                        12800,
                         "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(
-                        12605,
+                        12801,
                         "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(
-                        12606,
+                        12802,
                         "Controls whether the executed command is echoed to the output. Default is false."
                     )),
                     default: true
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(12607, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(12803, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        12608,
+                        12804,
                         "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(
-                        12609,
+                        12805,
                         "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(
-                        12610,
+                        12806,
                         "Whether the user is prompted when VS Code closes with a running task."
                     )),
                     default: false
                 },
                 isBuildCommand: {
                     type: "boolean",
-                    description: ( localize(12611, "Maps this task to Code's default build command.")),
+                    description: ( localize(12807, "Maps this task to Code's default build command.")),
                     default: true
                 },
                 isTestCommand: {
                     type: "boolean",
-                    description: ( localize(12612, "Maps this task to Code's default test command.")),
+                    description: ( localize(12808, "Maps this task to Code's default test command.")),
                     default: true
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        12601,
+                        12797,
                         "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(
-                        12597,
+                        12793,
                         "The command to be executed. Can be an external program or a shell command."
                     ))
                 },
                 args: {
                     type: "array",
-                    description: ( localize(12613, "Additional arguments passed to the command.")),
+                    description: ( localize(12809, "Additional arguments passed to the command.")),
                     items: {
                         type: "string"
                     }
@@ -260,15 +260,15 @@ const schema = {
                 showOutput: {
                     $ref: "#/definitions/showOutputType",
                     description: ( localize(
-                        12614,
+                        12810,
                         "Controls whether the output of the running task is shown or not. If omitted 'always' is used."
                     ))
                 },
                 isWatching: {
                     type: "boolean",
-                    deprecationMessage: ( localize(12615, "Deprecated. Use isBackground instead.")),
+                    deprecationMessage: ( localize(12811, "Deprecated. Use isBackground instead.")),
                     description: ( localize(
-                        12616,
+                        12812,
                         "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(
-                        12617,
+                        12813,
                         "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(
-                        12618,
+                        12814,
                         "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(
-                        12606,
+                        12802,
                         "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(
-                        12619,
+                        12815,
                         "Controls whether the task name is added as an argument to the command. Default is false."
                     )),
                     default: true
                 },
                 taskSelector: {
                     type: "string",
-                    description: ( localize(12620, "Prefix to indicate that an argument is task."))
+                    description: ( localize(12816, "Prefix to indicate that an argument is task."))
                 },
                 problemMatcher: {
                     $ref: "#/definitions/problemMatcherType",
                     description: ( localize(
-                        12621,
+                        12817,
                         "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(
-                        12622,
+                        12818,
                         "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

@@ -1,7 +1,7 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { deepClone } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
-import { ProblemMatcherRegistry } from './problemMatcher.js';
+import { ProblemMatcherRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/problemMatcher';
 import schema$1 from './jsonSchemaCommon.js';
 
 const schema = {
@@ -13,32 +13,32 @@ const schema = {
                 version: {
                     type: "string",
                     enum: ["0.1.0"],
-                    deprecationMessage: ( localize(12623, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
-                    description: ( localize(12624, "The config's version number"))
+                    deprecationMessage: ( localize(12819, "Task version 0.1.0 is deprecated. Please use 2.0.0")),
+                    description: ( localize(12820, "The config's version number"))
                 },
                 _runner: {
-                    deprecationMessage: ( localize(12625, "The runner has graduated. Use the official runner property"))
+                    deprecationMessage: ( localize(12821, "The runner has graduated. Use the official runner property"))
                 },
                 runner: {
                     type: "string",
                     enum: ["process", "terminal"],
                     default: "process",
                     description: ( localize(
-                        12626,
+                        12822,
                         "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(12627, "Windows specific command configuration"))
+                    description: ( localize(12823, "Windows specific command configuration"))
                 },
                 osx: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(12628, "Mac specific command configuration"))
+                    description: ( localize(12824, "Mac specific command configuration"))
                 },
                 linux: {
                     $ref: "#/definitions/taskRunnerConfiguration",
-                    description: ( localize(12629, "Linux specific command configuration"))
+                    description: ( localize(12825, "Linux specific command configuration"))
                 }
             }
         }, {
@@ -50,7 +50,7 @@ const shellCommand = {
     type: "boolean",
     default: true,
     description: ( localize(
-        12630,
+        12826,
         "Specifies whether the command is a shell command or an external program. Defaults to false if omitted."
     ))
 };