@codingame/monaco-vscode-task-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-task-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -3092,7 +3092,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
         let configFileCreated = false;
         this._fileService.stat(resource).then((stat) => stat, () => undefined).then(async (stat) => {
             const fileExists = !!stat;
-            const configValue = this._configurationService.inspect('tasks');
+            const configValue = this._configurationService.inspect('tasks', { resource });
             let tasksExistInFile;
             let target;
             switch (taskSource) {

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

@@ -14,7 +14,7 @@ import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/services/
 import { TASKS_CATEGORY, TaskEventKind, TaskGroup, TASK_RUNNING_STATE, TaskSettingId } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { TaskExecutionSupportedContext, TaskCommandsRegistered } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { RunAutomaticTasks, ManageAutomaticTaskRunning } from './runAutomaticTasks.js';
 import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
@@ -91,7 +91,7 @@ let TaskStatusBarContributions = class TaskStatusBarContributions extends Dispos
                 }
             }
             if (promise && (event.kind === TaskEventKind.Active) && (this._activeTasksCount === 1)) {
-                this._progressService.withProgress({ location: ProgressLocation.Window, command: 'workbench.action.tasks.showTasks', type: 'loading' }, progress => {
+                this._progressService.withProgress({ location: ProgressLocation.Window, command: 'workbench.action.tasks.showTasks' }, progress => {
                     progress.report({ message: ( localizeWithPath(_moduleId, 0, 'Building...')) });
                     return promise;
                 }).then(() => {
@@ -387,14 +387,21 @@ schema.definitions = {
 schema.oneOf = [...(schema$2.oneOf || []), ...(schema$1.oneOf || [])];
 const jsonRegistry = ( (Registry.as(Extensions$3.JSONContribution)));
 jsonRegistry.registerSchema(tasksSchemaId, schema);
-ProblemMatcherRegistry.onMatcherChanged(() => {
-    updateProblemMatchers();
-    jsonRegistry.notifySchemaChanged(tasksSchemaId);
-});
-TaskDefinitionRegistry.onDefinitionsChanged(() => {
-    updateTaskDefinitions();
-    jsonRegistry.notifySchemaChanged(tasksSchemaId);
-});
+class TaskRegistryContribution extends Disposable {
+    static { this.ID = 'taskRegistryContribution'; }
+    constructor() {
+        super();
+        this._register(ProblemMatcherRegistry.onMatcherChanged(() => {
+            updateProblemMatchers();
+            jsonRegistry.notifySchemaChanged(tasksSchemaId);
+        }));
+        this._register(TaskDefinitionRegistry.onDefinitionsChanged(() => {
+            updateTaskDefinitions();
+            jsonRegistry.notifySchemaChanged(tasksSchemaId);
+        }));
+    }
+}
+registerWorkbenchContribution2(TaskRegistryContribution.ID, TaskRegistryContribution, WorkbenchPhase.AfterRestored);
 const configurationRegistry = ( (Registry.as(Extensions$4.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'task',
@@ -546,4 +553,4 @@ configurationRegistry.registerConfiguration({
     }
 });
 
-export { TaskStatusBarContributions };
+export { TaskRegistryContribution, TaskStatusBarContributions };