@codingame/monaco-vscode-task-service-override 2.0.3 → 2.1.0

package/package.json

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

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

@@ -57,7 +57,8 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { IWorkspaceTrustRequestService, IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { VirtualWorkspaceContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
-import { IViewsService, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { isWorkspaceFolder, QUICKOPEN_DETAIL_CONFIG, TaskQuickPick, QUICKOPEN_SKIP_CONFIG, configureTaskIcon } from './taskQuickPick.js';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';

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

@@ -5,7 +5,7 @@ import { isUNC } from 'vscode/vscode/vs/base/common/extpath';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LinkedMap } from 'vscode/vscode/vs/base/common/map';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
-import { delimiter, join, isAbsolute, posix, parse, sep } from 'vscode/vscode/vs/base/common/path';
+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';
@@ -855,14 +855,6 @@ class TerminalTaskSystem extends Disposable {
             if (!terminal) {
                 return Promise.reject(( new Error(`Failed to create terminal for task ${task._label}`)));
             }
-            let processStartedSignaled = false;
-            terminal.processReady.then(() => {
-                if (!processStartedSignaled) {
-                    this._fireTaskEvent(TaskEvent.processStarted(task, terminal.instanceId, terminal.processId));
-                    processStartedSignaled = true;
-                }
-            }, (_error) => {
-            });
             this._fireTaskEvent(TaskEvent.start(task, terminal.instanceId, resolver.values));
             const mapKey = task.getMapKey();
             this._busyTasks[mapKey] = task;
@@ -876,6 +868,14 @@ class TerminalTaskSystem extends Disposable {
                 this._fileService
             ));
             this._terminalStatusManager.addTerminal(task, terminal, startStopProblemMatcher);
+            let processStartedSignaled = false;
+            terminal.processReady.then(() => {
+                if (!processStartedSignaled) {
+                    this._fireTaskEvent(TaskEvent.processStarted(task, terminal.instanceId, terminal.processId));
+                    processStartedSignaled = true;
+                }
+            }, (_error) => {
+            });
             const onData = terminal.onLineData((line) => {
                 startStopProblemMatcher.processLine(line);
             });
@@ -1023,27 +1023,27 @@ class TerminalTaskSystem extends Disposable {
             }
             const shellArgs = Array.isArray(shellLaunchConfig.args) ? shellLaunchConfig.args.slice(0) : [shellLaunchConfig.args];
             const toAdd = [];
-            const basename = posix.basename((await this._pathService.fileURI(shellLaunchConfig.executable)).path).toLowerCase();
-            const commandLine = this._buildShellCommandLine(platform, basename, shellOptions, command, originalCommand, args);
+            const basename$1 = posix.basename((await this._pathService.fileURI(shellLaunchConfig.executable)).path).toLowerCase();
+            const commandLine = this._buildShellCommandLine(platform, basename$1, shellOptions, command, originalCommand, args);
             let windowsShellArgs = false;
             if (platform === 3 ) {
                 windowsShellArgs = true;
                 const userHome = await this._pathService.userHome();
-                if (basename === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
+                if (basename$1 === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
                     return undefined;
                 }
-                if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
+                if ((basename$1 === 'powershell.exe') || (basename$1 === 'pwsh.exe')) {
                     if (!shellSpecified) {
                         toAdd.push('-Command');
                     }
                 }
-                else if ((basename === 'bash.exe') || (basename === 'zsh.exe')) {
+                else if ((basename$1 === 'bash.exe') || (basename$1 === 'zsh.exe')) {
                     windowsShellArgs = false;
                     if (!shellSpecified) {
                         toAdd.push('-c');
                     }
                 }
-                else if (basename === 'wsl.exe') {
+                else if (basename$1 === 'wsl.exe') {
                     if (!shellSpecified) {
                         toAdd.push('-e');
                     }
@@ -1064,7 +1064,7 @@ class TerminalTaskSystem extends Disposable {
             shellLaunchConfig.args = windowsShellArgs ? combinedShellArgs.join(' ') : combinedShellArgs;
             if (task.command.presentation && task.command.presentation.echo) {
                 if (needsFolderQualification && workspaceFolder) {
-                    const folder = cwd ? posix.basename(( cwd.toString())) : workspaceFolder.name;
+                    const folder = cwd && typeof cwd === 'object' && 'path' in cwd ? basename(cwd.path) : workspaceFolder.name;
                     shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
                         key: 'task.executingInFolder',
                         comment: ['The workspace folder the task is running in', 'The task command line or label']

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

@@ -334,7 +334,7 @@ class WatchingProblemCollector extends AbstractProblemCollector {
         this.modelListeners.add(this.modelService.onModelRemoved(modelEvent => {
             let markerChanged = Event.debounce(this.markerService.onMarkerChanged, (last, e) => {
                 return (last ?? []).concat(e);
-            }, 500)(async (markerEvent) => {
+            }, 500, false, true)(async (markerEvent) => {
                 markerChanged?.dispose();
                 markerChanged = undefined;
                 if (!markerEvent.includes(modelEvent.uri) || (this.markerService.read({ resource: modelEvent.uri }).length !== 0)) {
@@ -346,8 +346,9 @@ class WatchingProblemCollector extends AbstractProblemCollector {
                 }
             });
             setTimeout(async () => {
-                markerChanged?.dispose();
+                const _markerChanged = markerChanged;
                 markerChanged = undefined;
+                _markerChanged?.dispose();
             }, 600);
         }));
     }