@codingame/monaco-vscode-task-service-override 4.5.2 → 5.0.0

package/package.json

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

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

@@ -267,9 +267,9 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
             }
             return task._label;
         });
-        this._lifecycleService.onBeforeShutdown(e => {
+        this._register(this._lifecycleService.onBeforeShutdown(e => {
             this._willRestart = e.reason !== 3 ;
-        });
+        }));
         this._register(this.onDidStateChange(e => {
             this._log(( localizeWithPath(_moduleId, 3, 'Task Event kind: {0}', e.kind)), true);
             if (e.kind === "changed" ) ;
@@ -2841,7 +2841,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
     }
     _getDefaultTasks(tasks, taskGlobsInList = false) {
         const defaults = [];
-        for (const task of tasks) {
+        for (const task of tasks.filter(t => !!t.configurationProperties.group)) {
             if (taskGlobsInList && typeof task.configurationProperties.group.isDefault === 'string') {
                 defaults.push(task);
             }
@@ -2861,7 +2861,6 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
             title: strings.fetching
         };
         const promise = (async () => {
-            let groupTasks = [];
             async function runSingleTask(task, problemMatcherOptions, that) {
                 that.run(task, problemMatcherOptions, 1 ).then(undefined, reason => {
                 });
@@ -2884,27 +2883,9 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                     });
                 });
             };
-            let globTasksDetected = false;
-            const absoluteURI = EditorResourceAccessor.getOriginalUri(this._editorService.activeEditor);
-            if (absoluteURI) {
-                const workspaceFolder = this._contextService.getWorkspaceFolder(absoluteURI);
-                if (workspaceFolder) {
-                    const configuredTasks = this._getConfiguration(workspaceFolder)?.config?.tasks;
-                    if (configuredTasks) {
-                        globTasksDetected = configuredTasks.filter(task => task.group && typeof task.group !== 'string' && typeof task.group.isDefault === 'string').length > 0;
-                        if (globTasksDetected) {
-                            const relativePath$1 = workspaceFolder?.uri ? (relativePath(workspaceFolder.uri, absoluteURI) ?? absoluteURI.path) : absoluteURI.path;
-                            groupTasks = await this._findWorkspaceTasks((task) => {
-                                const currentTaskGroup = task.configurationProperties.group;
-                                if (currentTaskGroup && typeof currentTaskGroup !== 'string' && typeof currentTaskGroup.isDefault === 'string') {
-                                    return (currentTaskGroup._id === taskGroup._id && match(currentTaskGroup.isDefault, relativePath$1));
-                                }
-                                return false;
-                            });
-                        }
-                    }
-                }
-            }
+            let groupTasks = [];
+            const { globGroupTasks, globTasksDetected } = await this._getGlobTasks(taskGroup._id);
+            groupTasks = [...globGroupTasks];
             if (!globTasksDetected && groupTasks.length === 0) {
                 groupTasks = await this._findWorkspaceTasksInGroup(taskGroup, true);
             }
@@ -2940,7 +2921,7 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 return handleMultipleTasks(true);
             }
             if (!groupTasks.length) {
-                groupTasks = await this._findWorkspaceTasksInGroup(taskGroup, false);
+                groupTasks = await this._findWorkspaceTasksInGroup(taskGroup, true);
             }
             if (groupTasks.length === 1) {
                 return resolveTaskAndRun(groupTasks[0]);
@@ -2949,6 +2930,32 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
         })();
         this._progressService.withProgress(options, () => promise);
     }
+    async _getGlobTasks(taskGroupId) {
+        let globTasksDetected = false;
+        const absoluteURI = EditorResourceAccessor.getOriginalUri(this._editorService.activeEditor);
+        if (absoluteURI) {
+            const workspaceFolder = this._contextService.getWorkspaceFolder(absoluteURI);
+            if (workspaceFolder) {
+                const configuredTasks = this._getConfiguration(workspaceFolder)?.config?.tasks;
+                if (configuredTasks) {
+                    globTasksDetected = configuredTasks.filter(task => task.group && typeof task.group !== 'string' && typeof task.group.isDefault === 'string').length > 0;
+                    if (globTasksDetected) {
+                        const relativePath$1 = workspaceFolder?.uri ? (relativePath(workspaceFolder.uri, absoluteURI) ?? absoluteURI.path) : absoluteURI.path;
+                        const globGroupTasks = await this._findWorkspaceTasks((task) => {
+                            const currentTaskGroup = task.configurationProperties.group;
+                            if (currentTaskGroup && typeof currentTaskGroup !== 'string' && typeof currentTaskGroup.isDefault === 'string') {
+                                return (currentTaskGroup._id === taskGroupId && match(currentTaskGroup.isDefault, relativePath$1));
+                            }
+                            globTasksDetected = false;
+                            return false;
+                        });
+                        return { globGroupTasks, globTasksDetected };
+                    }
+                }
+            }
+        }
+        return { globGroupTasks: [], globTasksDetected };
+    }
     _runBuildCommand() {
         if (!this._tasksReconnected) {
             return;
@@ -3114,10 +3121,11 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 });
             }
             else if (fileExists && (tasksExistInFile || content)) {
-                if (content) {
-                    this._configurationService.updateValue('tasks', parse$1(content), target);
+                const statResource = stat?.resource;
+                if (content && statResource) {
+                    this._configurationService.updateValue('tasks', parse$1(content), { resource: statResource }, target);
                 }
-                return stat?.resource;
+                return statResource;
             }
             return undefined;
         }).then((resource) => {
@@ -3274,10 +3282,26 @@ let AbstractTaskService = class AbstractTaskService extends Disposable {
                 const entries = [];
                 let selectedTask;
                 let selectedEntry;
-                this._showIgnoredFoldersMessage().then(() => {
+                this._showIgnoredFoldersMessage().then(async () => {
+                    const { globGroupTasks } = await this._getGlobTasks(TaskGroup.Build._id);
+                    let defaultTasks = globGroupTasks;
+                    if (!defaultTasks?.length) {
+                        defaultTasks = this._getDefaultTasks(tasks, false);
+                    }
+                    let defaultBuildTask;
+                    if (defaultTasks.length === 1) {
+                        const group = defaultTasks[0].configurationProperties.group;
+                        if (group) {
+                            if (typeof group === 'string' && group === TaskGroup.Build._id) {
+                                defaultBuildTask = defaultTasks[0];
+                            }
+                            else {
+                                defaultBuildTask = defaultTasks[0];
+                            }
+                        }
+                    }
                     for (const task of tasks) {
-                        const taskGroup = TaskGroup.from(task.configurationProperties.group);
-                        if (taskGroup && taskGroup.isDefault && taskGroup._id === TaskGroup.Build._id) {
+                        if (task === defaultBuildTask) {
                             const label = ( localizeWithPath(
                                 _moduleId,
                                 89,

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

@@ -51,7 +51,7 @@ let TaskStatusBarContributions = class TaskStatusBarContributions extends Dispos
     _registerListeners() {
         let promise = undefined;
         let resolve;
-        this._taskService.onDidStateChange(event => {
+        this._register(this._taskService.onDidStateChange(event => {
             if (event.kind === "changed" ) {
                 this._updateRunningTasksStatus();
             }
@@ -93,7 +93,7 @@ let TaskStatusBarContributions = class TaskStatusBarContributions extends Dispos
                     promise = undefined;
                 });
             }
-        });
+        }));
     }
     async _updateRunningTasksStatus() {
         const tasks = await this._taskService.getActiveTasks();

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

@@ -71,9 +71,11 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
     static applyColorStyles(task, entry, themeService) {
         if (task.configurationProperties.icon?.color) {
             const colorTheme = themeService.getColorTheme();
-            createColorStyleElement(colorTheme);
+            const disposable = createColorStyleElement(colorTheme);
             entry.iconClasses = [getColorClass(task.configurationProperties.icon.color)];
+            return disposable;
         }
+        return;
     }
     _createTaskEntry(task, extraButtons = []) {
         const buttons = [
@@ -81,7 +83,10 @@ let TaskQuickPick = TaskQuickPick_1 = class TaskQuickPick extends Disposable {
             ...extraButtons
         ];
         const entry = { label: TaskQuickPick_1.getTaskLabelWithIcon(task, this._guessTaskLabel(task)), description: this._taskService.getTaskDescription(task), task, detail: this._showDetail() ? task.configurationProperties.detail : undefined, buttons };
-        TaskQuickPick_1.applyColorStyles(task, entry, this._themeService);
+        const disposable = TaskQuickPick_1.applyColorStyles(task, entry, this._themeService);
+        if (disposable) {
+            this._register(disposable);
+        }
         return entry;
     }
     _createEntriesForGroup(entries, tasks, groupLabel, extraButtons = []) {

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

@@ -3,7 +3,7 @@ import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { ProblemMatcherRegistry } from './problemMatcher.js';
 import schema$1 from './jsonSchemaCommon.js';
 
-const _moduleId = "vs/workbench/contrib/tasks/common/jsonSchema_v1";
+const _moduleId = "vs/workbench/contrib/tasks/common/jsonSchem";
 const schema = {
     oneOf: [
         {

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

@@ -7,7 +7,7 @@ import { applyDeprecatedVariableMessage } from 'vscode/vscode/vs/workbench/servi
 import { inputsSchema } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolverSchema';
 import { getAllCodicons } from 'vscode/vscode/vs/base/common/codicons';
 
-const _moduleId = "vs/workbench/contrib/tasks/common/jsonSchema_v2";
+const _moduleId = "vs/workbench/contrib/tasks/common/jsonSchem";
 function fixReferences(literal) {
     if (Array.isArray(literal)) {
         literal.forEach(fixReferences);