@codingame/monaco-vscode-task-service-override 3.2.2 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-task-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -9,7 +9,7 @@ import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { ValidationStatus } from '../../../../base/common/parsers.js';
 import { isWeb, platform } from 'vscode/vscode/vs/base/common/platform';
 import { basename, joinPath, dirname, relativePath } from 'vscode/vscode/vs/base/common/resources';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { isString, isBoolean, isStringArray } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
@@ -595,7 +595,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 this._outputService.showChannel(this._outputChannel.id, true);
             }
             else {
-                this._notificationService.prompt(Severity.Warning, ( localizeWithPath(
+                this._notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                     'vs/workbench/contrib/tasks/browser/abstractTaskService',
                     'taskServiceOutputPrompt',
                     'There are task errors. See the output for details.'
@@ -1181,18 +1181,18 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
         if (!runnable || !runnable.task) {
             if (test) {
                 if (this.schemaVersion === 1 ) {
-                    throw new TaskError(Severity.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noTestTask1', 'No test task defined. Mark a task with \'isTestCommand\' in the tasks.json file.'), 3 );
+                    throw new TaskError(Severity$1.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noTestTask1', 'No test task defined. Mark a task with \'isTestCommand\' in the tasks.json file.'), 3 );
                 }
                 else {
-                    throw new TaskError(Severity.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noTestTask2', 'No test task defined. Mark a task with as a \'test\' group in the tasks.json file.'), 3 );
+                    throw new TaskError(Severity$1.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noTestTask2', 'No test task defined. Mark a task with as a \'test\' group in the tasks.json file.'), 3 );
                 }
             }
             else {
                 if (this.schemaVersion === 1 ) {
-                    throw new TaskError(Severity.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noBuildTask1', 'No build task defined. Mark a task with \'isBuildCommand\' in the tasks.json file.'), 2 );
+                    throw new TaskError(Severity$1.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noBuildTask1', 'No build task defined. Mark a task with \'isBuildCommand\' in the tasks.json file.'), 2 );
                 }
                 else {
-                    throw new TaskError(Severity.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noBuildTask2', 'No build task defined. Mark a task with as a \'build\' group in the tasks.json file.'), 2 );
+                    throw new TaskError(Severity$1.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskService.noBuildTask2', 'No build task defined. Mark a task with as a \'build\' group in the tasks.json file.'), 2 );
                 }
             }
         }
@@ -1211,7 +1211,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
             return;
         }
         if (!task) {
-            throw new TaskError(Severity.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskServer.noTask', 'Task to execute is undefined'), 5 );
+            throw new TaskError(Severity$1.Info, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskServer.noTask', 'Task to execute is undefined'), 5 );
         }
         const resolver = this._createResolver();
         let executeTaskResult;
@@ -1847,8 +1847,8 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 )),
                 cancelButton: ( localizeWithPath(
                     'vs/workbench/contrib/tasks/browser/abstractTaskService',
-                    'saveBeforeRun.dontSave',
-                    'Don\'t save'
+                    { key: 'saveBeforeRun.dontSave', comment: ['&& denotes a mnemonic'] },
+                    "Do&&n't Save"
                 )),
             });
             if (!confirmed) {
@@ -1895,7 +1895,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                         executeResult.task.getQualifiedLabel()
                     ));
                     const lastInstance = this._getTaskSystem().getLastInstance(executeResult.task) ?? executeResult.task;
-                    this._notificationService.prompt(Severity.Warning, message, [{
+                    this._notificationService.prompt(Severity$1.Warning, message, [{
                             label: ( localizeWithPath(
                                 'vs/workbench/contrib/tasks/browser/abstractTaskService',
                                 'terminateTask',
@@ -1917,7 +1917,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 }
             }
             else {
-                throw new TaskError(Severity.Warning, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), 1 );
+                throw new TaskError(Severity$1.Warning, localizeWithPath('vs/workbench/contrib/tasks/browser/abstractTaskService', 'TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), 1 );
             }
         }
         this._setRecentlyUsedTask(executeResult.task);
@@ -2428,6 +2428,10 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
         if (!config) {
             return false;
         }
+        else if (!workspaceFolder) {
+            this._logService.trace('TaskService.computeTasksForSingleConfig: no workspace folder for worskspace', this._workspace?.id);
+            return false;
+        }
         const taskSystemInfo = this._getTaskSystemInfo(workspaceFolder.uri.scheme);
         const problemReporter = ( new ProblemReporter(this._outputChannel));
         const parseResult = parse(workspaceFolder, this._workspace, taskSystemInfo ? taskSystemInfo.platform : platform, config, problemReporter, source, this._contextKeyService, isRecentTask);
@@ -2812,7 +2816,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
         if (this.ignoredWorkspaceFolders.length === 0 || !this.showIgnoreMessage) {
             return Promise.resolve(undefined);
         }
-        this._notificationService.prompt(Severity.Info, ( localizeWithPath(
+        this._notificationService.prompt(Severity$1.Info, ( localizeWithPath(
             'vs/workbench/contrib/tasks/browser/abstractTaskService',
             'TaskService.ignoredFolder',
             'The following workspace folders are ignored since they use task version 0.1.0: {0}',
@@ -3782,7 +3786,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
             }
         }
         this._updateSetup();
-        this._notificationService.prompt(Severity.Warning, fileDiffs.length === 1 ?
+        this._notificationService.prompt(Severity$1.Warning, fileDiffs.length === 1 ?
             ( localizeWithPath(
                 'vs/workbench/contrib/tasks/browser/abstractTaskService',
                 'taskService.upgradeVersion',

package/vscode/src/vs/workbench/contrib/tasks/browser/task.contribution.js

@@ -151,7 +151,7 @@ TaskStatusBarContributions = ( __decorate([
 ], TaskStatusBarContributions));
 workbenchRegistry.registerWorkbenchContribution(TaskStatusBarContributions, 3 );
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "2_run" ,
+    group: "3_run" ,
     command: {
         id: 'workbench.action.tasks.runTask',
         title: ( localizeWithPath(
@@ -164,7 +164,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "2_run" ,
+    group: "3_run" ,
     command: {
         id: 'workbench.action.tasks.build',
         title: ( localizeWithPath(
@@ -177,7 +177,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "3_manage" ,
+    group: "5_manage" ,
     command: {
         precondition: TASK_RUNNING_STATE,
         id: 'workbench.action.tasks.showTasks',
@@ -191,7 +191,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "3_manage" ,
+    group: "5_manage" ,
     command: {
         precondition: TASK_RUNNING_STATE,
         id: 'workbench.action.tasks.restartTask',
@@ -205,7 +205,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "3_manage" ,
+    group: "5_manage" ,
     command: {
         precondition: TASK_RUNNING_STATE,
         id: 'workbench.action.tasks.terminate',
@@ -219,7 +219,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "4_configure" ,
+    group: "7_configure" ,
     command: {
         id: 'workbench.action.tasks.configureTaskRunner',
         title: ( localizeWithPath(
@@ -232,7 +232,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
     when: TaskExecutionSupportedContext
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
-    group: "4_configure" ,
+    group: "7_configure" ,
     command: {
         id: 'workbench.action.tasks.configureDefaultBuildTask',
         title: ( localizeWithPath(

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

@@ -1,6 +1,8 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ExecutionEngine } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { AbstractTaskService } from './abstractTaskService.js';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 class TaskService extends AbstractTaskService {
     static { this.ProcessTaskSystemSupportMessage = ( localizeWithPath(

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Disposable, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { StartStopProblemCollector } from '../common/problemCollectors.js';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
@@ -10,47 +10,47 @@ import { spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegi
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 
 const TASK_TERMINAL_STATUS_ID = 'task_terminal_status';
-const ACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: spinningLoading, severity: Severity.Info, tooltip: ( localizeWithPath(
+const ACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: spinningLoading, severity: Severity$1.Info, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.active',
     "Task is running"
 )) };
-const SUCCEEDED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity.Info, tooltip: ( localizeWithPath(
+const SUCCEEDED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity$1.Info, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.succeeded',
     "Task succeeded"
 )) };
-const SUCCEEDED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity.Info, tooltip: ( localizeWithPath(
+const SUCCEEDED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.check, severity: Severity$1.Info, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.succeededInactive',
     "Task succeeded and waiting..."
 )) };
-const FAILED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity.Error, tooltip: ( localizeWithPath(
+const FAILED_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.errors',
     "Task has errors"
 )) };
-const FAILED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity.Error, tooltip: ( localizeWithPath(
+const FAILED_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.error, severity: Severity$1.Error, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.errorsInactive',
     "Task has errors and is waiting..."
 )) };
-const WARNING_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity.Warning, tooltip: ( localizeWithPath(
+const WARNING_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.warnings',
     "Task has warnings"
 )) };
-const WARNING_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity.Warning, tooltip: ( localizeWithPath(
+const WARNING_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.warning, severity: Severity$1.Warning, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.warningsInactive',
     "Task has warnings and is waiting..."
 )) };
-const INFO_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity.Info, tooltip: ( localizeWithPath(
+const INFO_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.infos',
     "Task has infos"
 )) };
-const INFO_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity.Info, tooltip: ( localizeWithPath(
+const INFO_INACTIVE_TASK_STATUS = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity$1.Info, tooltip: ( localizeWithPath(
     'vs/workbench/contrib/tasks/browser/taskTerminalStatus',
     'taskTerminalStatus.infosInactive',
     "Task has infos and is waiting..."
@@ -82,7 +82,7 @@ let TaskTerminalStatus = class TaskTerminalStatus extends Disposable {
         }));
     }
     addTerminal(task, terminal, problemMatcher) {
-        const status = { id: TASK_TERMINAL_STATUS_ID, severity: Severity.Info };
+        const status = { id: TASK_TERMINAL_STATUS_ID, severity: Severity$1.Info };
         terminal.statusList.add(status);
         this._register(problemMatcher.onDidFindFirstMatch(() => {
             this._marker = terminal.registerMarker();

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

@@ -8,7 +8,7 @@ import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { delimiter, join, isAbsolute, posix, basename, parse, sep } from 'vscode/vscode/vs/base/common/path';
 import { isWindows, platform, PlatformToString } from 'vscode/vscode/vs/base/common/platform';
 import { toLocalResource } from 'vscode/vscode/vs/base/common/resources';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { isString, isObject } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
@@ -198,11 +198,11 @@ class TerminalTaskSystem extends Disposable {
             }
             else if (error instanceof Error) {
                 this._log(error.message);
-                throw new TaskError(Severity.Error, error.message, 7 );
+                throw new TaskError(Severity$1.Error, error.message, 7 );
             }
             else {
                 this._log(( error.toString()));
-                throw new TaskError(Severity.Error, localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', 'TerminalTaskSystem.unknownError', 'A unknown error has occurred while executing a task. See task output log for details.'), 7 );
+                throw new TaskError(Severity$1.Error, localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', 'TerminalTaskSystem.unknownError', 'A unknown error has occurred while executing a task. See task output log for details.'), 7 );
             }
         }
     }
@@ -227,7 +227,7 @@ class TerminalTaskSystem extends Disposable {
                 this._log(loadMessage + '\n');
             });
             const openOutput = 'Show Output';
-            this._notificationService.prompt(Severity.Warning, ( localizeWithPath(
+            this._notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                 'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
                 'TerminalTaskSystem.taskLoadReporting',
                 "There are issues with task \"{0}\". See the output for more details.",
@@ -1265,7 +1265,7 @@ class TerminalTaskSystem extends Disposable {
             args = resolvedResult.args;
             this._currentTask.shellLaunchConfig = launchConfigs = await this._createShellLaunchConfig(task, workspaceFolder, resolver, platform$1, options, command, args, waitOnExit);
             if (launchConfigs === undefined) {
-                return [undefined, ( new TaskError(Severity.Error, ( localizeWithPath(
+                return [undefined, ( new TaskError(Severity$1.Error, ( localizeWithPath(
                     'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
                     'TerminalTaskSystem',
                     'Can\'t execute a shell command on an UNC drive using cmd.exe.'

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

@@ -435,6 +435,5 @@ const schema = {
         }
     }
 };
-var commonSchema = schema;
 
-export { commonSchema as default };
+export { schema as default };

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

@@ -1,7 +1,7 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { ProblemMatcherRegistry } from './problemMatcher.js';
-import commonSchema from './jsonSchemaCommon.js';
+import schema$1 from './jsonSchemaCommon.js';
 
 const schema = {
     oneOf: [
@@ -84,7 +84,7 @@ const shellCommand = {
         'Specifies whether the command is a shell command or an external program. Defaults to false if omitted.'
     ))
 };
-schema.definitions = deepClone(commonSchema.definitions);
+schema.definitions = deepClone(schema$1.definitions);
 const definitions = schema.definitions;
 definitions['commandConfiguration']['properties']['isShellCommand'] = deepClone(shellCommand);
 definitions['taskDescription']['properties']['isShellCommand'] = deepClone(shellCommand);

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

@@ -1,6 +1,6 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
-import commonSchema from './jsonSchemaCommon.js';
+import schema$1 from './jsonSchemaCommon.js';
 import { ProblemMatcherRegistry } from './problemMatcher.js';
 import { TaskDefinitionRegistry } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
 import { applyDeprecatedVariableMessage } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolverUtils';
@@ -601,7 +601,7 @@ const runOptions = {
         'The task\'s run related options'
     ))
 };
-const commonSchemaDefinitions = commonSchema.definitions;
+const commonSchemaDefinitions = schema$1.definitions;
 const options = deepClone(commonSchemaDefinitions.options);
 const optionsProperties = options.properties;
 optionsProperties.shell = deepClone(commonSchemaDefinitions.shellConfiguration);

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

@@ -337,7 +337,7 @@ class WatchingProblemCollector extends AbstractProblemCollector {
             }, 500, false, true)(async (markerEvent) => {
                 markerChanged?.dispose();
                 markerChanged = undefined;
-                if (!markerEvent.includes(modelEvent.uri) || (this.markerService.read({ resource: modelEvent.uri }).length !== 0)) {
+                if (!markerEvent || !markerEvent.includes(modelEvent.uri) || (this.markerService.read({ resource: modelEvent.uri }).length !== 0)) {
                     return;
                 }
                 const oldLines = Array.from(this.lines);

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

@@ -6,7 +6,7 @@ import { join, normalize } from 'vscode/vscode/vs/base/common/path';
 import { isString, isUndefined, isStringArray, isUndefinedOrNull, isBoolean, isNumber } from 'vscode/vscode/vs/base/common/types';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { OS } from 'vscode/vscode/vs/base/common/platform';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Parser, ValidationStatus } from '../../../../base/common/parsers.js';
 import { asArray } from 'vscode/vscode/vs/base/common/arrays';
@@ -322,28 +322,28 @@ class AbstractLineMatcher {
         if (data.severity) {
             const value = data.severity;
             if (value) {
-                result = Severity.fromValue(value);
-                if (result === Severity.Ignore) {
+                result = Severity$1.fromValue(value);
+                if (result === Severity$1.Ignore) {
                     if (value === 'E') {
-                        result = Severity.Error;
+                        result = Severity$1.Error;
                     }
                     else if (value === 'W') {
-                        result = Severity.Warning;
+                        result = Severity$1.Warning;
                     }
                     else if (value === 'I') {
-                        result = Severity.Info;
+                        result = Severity$1.Info;
                     }
                     else if (equalsIgnoreCase(value, 'hint')) {
-                        result = Severity.Info;
+                        result = Severity$1.Info;
                     }
                     else if (equalsIgnoreCase(value, 'note')) {
-                        result = Severity.Info;
+                        result = Severity$1.Info;
                     }
                 }
             }
         }
-        if (result === null || result === Severity.Ignore) {
-            result = this.matcher.severity || Severity.Error;
+        if (result === null || result === Severity$1.Ignore) {
+            result = this.matcher.severity || Severity$1.Error;
         }
         return MarkerSeverity.fromSeverity(result);
     }
@@ -1136,15 +1136,15 @@ class ProblemMatcherParser extends Parser {
             }
         }
         const pattern = description.pattern ? this.createProblemPattern(description.pattern) : undefined;
-        let severity = description.severity ? Severity.fromValue(description.severity) : undefined;
-        if (severity === Severity.Ignore) {
+        let severity = description.severity ? Severity$1.fromValue(description.severity) : undefined;
+        if (severity === Severity$1.Ignore) {
             this.info(( localizeWithPath(
                 'vs/workbench/contrib/tasks/common/problemMatcher',
                 'ProblemMatcherParser.unknownSeverity',
                 'Info: unknown severity {0}. Valid values are error, warning and info.\n',
                 description.severity
             )));
-            severity = Severity.Error;
+            severity = Severity$1.Error;
         }
         if (isString(description.base)) {
             const variableName = description.base;
@@ -1710,7 +1710,7 @@ class ProblemMatcherRegistryImpl {
             applyTo: ApplyToKind.allDocuments,
             fileLocation: FileLocationKind.Absolute,
             pattern: ProblemPatternRegistry.get('lessCompile'),
-            severity: Severity.Error
+            severity: Severity$1.Error
         });
         this.add({
             name: 'gulp-tsc',