@codingame/monaco-vscode-task-service-override 20.4.1 → 21.0.0

package/index.d.ts

@@ -1,2 +1,15 @@
 import type { IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
-export default function getServiceOverride(): IEditorOverrideServices;
+export interface ForcedSupportedExecutions {
+    custom?: boolean;
+    shell?: boolean;
+    process?: boolean;
+}
+export interface TaskServiceOverrideParams {
+    /**
+     * By default, only custom tasks are supported
+     * When using the VSCode server, the server registers all the task types as supported
+     * But if the user has registered custom terminal backends, they may want to force support for other task types
+     */
+    forcedSupportedExecutions?: ForcedSupportedExecutions;
+}
+export default function getServiceOverride({ forcedSupportedExecutions }?: TaskServiceOverrideParams): IEditorOverrideServices;

package/index.js

@@ -1,12 +1,97 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { ITaskService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { TaskService } from './vscode/src/vs/workbench/contrib/tasks/browser/taskService.js';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { IOutputService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service';
+import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
+import { ITerminalService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
+import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
+import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IWorkspaceTrustRequestService, IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import './vscode/src/vs/workbench/contrib/tasks/browser/task.contribution.js';
 
-function getServiceOverride() {
+let CustomTaskService = class CustomTaskService extends TaskService {
+    constructor(forcedSupportedExecutions, _configurationService, _markerService, _outputService, _paneCompositeService, _viewsService, _commandService, _editorService, _fileService, _contextService, _telemetryService, _textFileService, _modelService, _extensionService, _quickInputService, _configurationResolverService, _terminalService, _terminalGroupService, _storageService, _progressService, _openerService, _dialogService, _notificationService, _contextKeyService, _environmentService, _terminalProfileResolverService, _pathService, _textModelResolverService, _preferencesService, _viewDescriptorService, _workspaceTrustRequestService, _workspaceTrustManagementService, _logService, _themeService, _lifecycleService, remoteAgentService, _instantiationService, _chatService, _chatAgentService) {
+        super(_configurationService, _markerService, _outputService, _paneCompositeService, _viewsService, _commandService, _editorService, _fileService, _contextService, _telemetryService, _textFileService, _modelService, _extensionService, _quickInputService, _configurationResolverService, _terminalService, _terminalGroupService, _storageService, _progressService, _openerService, _dialogService, _notificationService, _contextKeyService, _environmentService, _terminalProfileResolverService, _pathService, _textModelResolverService, _preferencesService, _viewDescriptorService, _workspaceTrustRequestService, _workspaceTrustManagementService, _logService, _themeService, _lifecycleService, remoteAgentService, _instantiationService, _chatService, _chatAgentService);
+        if (forcedSupportedExecutions != null) {
+            this.registerSupportedExecutions(forcedSupportedExecutions.custom, forcedSupportedExecutions.shell, forcedSupportedExecutions.process);
+        }
+    }
+};
+CustomTaskService = __decorate([
+    __param(1, IConfigurationService),
+    __param(2, IMarkerService),
+    __param(3, IOutputService),
+    __param(4, IPaneCompositePartService),
+    __param(5, IViewsService),
+    __param(6, ICommandService),
+    __param(7, IEditorService),
+    __param(8, IFileService),
+    __param(9, IWorkspaceContextService),
+    __param(10, ITelemetryService),
+    __param(11, ITextFileService),
+    __param(12, IModelService),
+    __param(13, IExtensionService),
+    __param(14, IQuickInputService),
+    __param(15, IConfigurationResolverService),
+    __param(16, ITerminalService),
+    __param(17, ITerminalGroupService),
+    __param(18, IStorageService),
+    __param(19, IProgressService),
+    __param(20, IOpenerService),
+    __param(21, IDialogService),
+    __param(22, INotificationService),
+    __param(23, IContextKeyService),
+    __param(24, IWorkbenchEnvironmentService),
+    __param(25, ITerminalProfileResolverService),
+    __param(26, IPathService),
+    __param(27, ITextModelService),
+    __param(28, IPreferencesService),
+    __param(29, IViewDescriptorService),
+    __param(30, IWorkspaceTrustRequestService),
+    __param(31, IWorkspaceTrustManagementService),
+    __param(32, ILogService),
+    __param(33, IThemeService),
+    __param(34, ILifecycleService),
+    __param(35, IRemoteAgentService),
+    __param(36, IInstantiationService),
+    __param(37, IChatService),
+    __param(38, IChatAgentService)
+], CustomTaskService);
+function getServiceOverride({ forcedSupportedExecutions } = {}) {
     return {
-        [ITaskService.toString()]: new SyncDescriptor(TaskService, [], true)
+        [ITaskService.toString()]: new SyncDescriptor(CustomTaskService, [forcedSupportedExecutions], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-task-service-override",
-  "version": "20.4.1",
+  "version": "21.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - task service-override",
   "keywords": [],
@@ -15,16 +15,16 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "20.4.1",
-    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.4.1",
-    "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common": "20.4.1",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.4.1",
-    "@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common": "20.4.1",
-    "@codingame/monaco-vscode-api": "20.4.1",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "20.4.1",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.4.1",
-    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "20.4.1",
-    "@codingame/monaco-vscode-ec8fe440-1fd1-523d-ad0f-c0f5a80cf451-common": "20.4.1"
+    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "21.0.0",
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "21.0.0",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.0",
+    "@codingame/monaco-vscode-625898ab-0e33-5b7f-a3ae-29c10271dc1c-common": "21.0.0",
+    "@codingame/monaco-vscode-ab07af84-42e8-5a0f-8aef-b83fb90ede21-common": "21.0.0",
+    "@codingame/monaco-vscode-api": "21.0.0",
+    "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common": "21.0.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "21.0.0",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "21.0.0",
+    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "21.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/tasks/browser/abstractTaskService.d.ts

@@ -7,6 +7,7 @@ import * as nls from "@codingame/monaco-vscode-api/vscode/vs/nls";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IMarkerData } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -27,7 +28,7 @@ import { ITerminalGroupService } from "@codingame/monaco-vscode-api/vscode/vs/wo
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
 import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, ITaskEvent, ITaskIdentifier, Task, TaskRunSource, TaskSorter } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/tasks";
-import { ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, IWorkspaceFolderTaskResult } from "@codingame/monaco-vscode-ec8fe440-1fd1-523d-ad0f-c0f5a80cf451-common/vscode/vs/workbench/contrib/tasks/common/taskService";
+import { ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, IWorkspaceFolderTaskResult } from "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService";
 import { ITaskService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/tasks/common/taskService.service";
 import { ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse } from "../common/taskSystem.js";
 import * as TaskConfig from "../common/taskConfiguration.js";
@@ -131,6 +132,7 @@ export declare abstract class AbstractTaskService extends Disposable implements
     private _recentlyUsedTasks;
     private _persistentTasks;
     protected _taskRunningState: IContextKey<boolean>;
+    protected _tasksAvailableState: IContextKey<boolean>;
     protected _outputChannel: IOutputChannel;
     protected readonly _onDidStateChange: Emitter<ITaskEvent>;
     private _waitForAllSupportedExecutions;
@@ -238,9 +240,13 @@ export declare abstract class AbstractTaskService extends Disposable implements
     private _getCustomTaskPromises;
     private _getLegacyTaskConfigurations;
     getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
+    getTaskProblems(instanceId: number): Map<string, {
+        resources: URI[];
+        markers: IMarkerData[];
+    }> | undefined;
     private _updateWorkspaceTasks;
     private _getAFolder;
-    getTerminalForTask(task: Task): URI | undefined;
+    getTerminalsForTasks(task: (Task | Task[])): URI[] | undefined;
     protected _computeWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
     private get _jsonTasksSupported();
     private _computeWorkspaceFolderTasks;