@codingame/monaco-vscode-task-service-override 26.2.2 → 27.0.0

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

@@ -22,21 +22,22 @@ var IProblemCollectorEvent;
     IProblemCollectorEvent.create = create;
 })(IProblemCollectorEvent || (IProblemCollectorEvent = {}));
 class AbstractProblemCollector extends Disposable {
-    constructor(problemMatchers, markerService, modelService, fileService) {
+    constructor(problemMatchers, markerService, modelService, fileService, logService) {
         super();
         this.problemMatchers = problemMatchers;
         this.markerService = markerService;
         this.modelService = modelService;
+        this.logService = logService;
         this.modelListeners = ( new DisposableStore());
-        this._onDidFindFirstMatch = ( new Emitter());
+        this._onDidFindFirstMatch = this._register(( new Emitter()));
         this.onDidFindFirstMatch = this._onDidFindFirstMatch.event;
-        this._onDidFindErrors = ( new Emitter());
+        this._onDidFindErrors = this._register(( new Emitter()));
         this.onDidFindErrors = this._onDidFindErrors.event;
-        this._onDidRequestInvalidateLastMarker = ( new Emitter());
+        this._onDidRequestInvalidateLastMarker = this._register(( new Emitter()));
         this.onDidRequestInvalidateLastMarker = this._onDidRequestInvalidateLastMarker.event;
         this.matchers = Object.create(null);
         this.bufferLength = 1;
-        ( problemMatchers.map(elem => createLineMatcher(elem, fileService))).forEach(matcher => {
+        ( problemMatchers.map(elem => createLineMatcher(elem, fileService, logService))).forEach(matcher => {
             const length = matcher.matchLength;
             if (length > this.bufferLength) {
                 this.bufferLength = length;
@@ -72,7 +73,7 @@ class AbstractProblemCollector extends Disposable {
             delete this.openModels[( model.uri.toString())];
         }, this, this.modelListeners));
         this.modelService.getModels().forEach(model => this.openModels[( model.uri.toString())] = true);
-        this._onDidStateChange = ( new Emitter());
+        this._onDidStateChange = this._register(( new Emitter()));
     }
     get onDidStateChange() {
         return this._onDidStateChange.event;
@@ -293,9 +294,10 @@ class StartStopProblemCollector extends AbstractProblemCollector {
         markerService,
         modelService,
         _strategy = ProblemHandlingStrategy.Clean,
-        fileService
+        fileService,
+        logService
     ) {
-        super(problemMatchers, markerService, modelService, fileService);
+        super(problemMatchers, markerService, modelService, fileService, logService);
         this._hasStarted = false;
         const ownerSet = Object.create(null);
         problemMatchers.forEach(description => ownerSet[description.owner] = true);
@@ -333,8 +335,8 @@ class StartStopProblemCollector extends AbstractProblemCollector {
     }
 }
 class WatchingProblemCollector extends AbstractProblemCollector {
-    constructor(problemMatchers, markerService, modelService, fileService) {
-        super(problemMatchers, markerService, modelService, fileService);
+    constructor(problemMatchers, markerService, modelService, fileService, logService) {
+        super(problemMatchers, markerService, modelService, fileService, logService);
         this.lines = [];
         this.beginPatterns = [];
         this.resetCurrentResource();
@@ -360,7 +362,11 @@ class WatchingProblemCollector extends AbstractProblemCollector {
                 false,
                 true
             )(async markerEvent => {
-                if (!markerEvent || !markerEvent.includes(modelEvent.uri) || (this.markerService.read({
+                if (markerEvent.length === 0) {
+                    return;
+                }
+                const modelEventUriStr = ( modelEvent.uri.toString());
+                if ((!( markerEvent.some(uri => ( uri.toString()) === modelEventUriStr))) || (this.markerService.read({
                     resource: modelEvent.uri
                 }).length !== 0)) {
                     return;
@@ -370,7 +376,6 @@ class WatchingProblemCollector extends AbstractProblemCollector {
                     await this.processLineInternal(line);
                 }
             });
-            this._register(markerChanged);
             setTimeout(() => {
                 if (markerChanged) {
                     const _markerChanged = markerChanged;
@@ -420,7 +425,15 @@ class WatchingProblemCollector extends AbstractProblemCollector {
     async tryBegin(line) {
         let result = false;
         for (const background of this.backgroundPatterns) {
+            const start = Date.now();
             const matches = background.begin.regexp.exec(line);
+            const elapsed = Date.now() - start;
+            if (elapsed > 5) {
+                this.logService?.trace(
+                    `ProblemMatcher: slow begin regexp took ${elapsed}ms to execute`,
+                    background.begin.regexp.source
+                );
+            }
             if (matches) {
                 if (( this._activeBackgroundMatchers.has(background.key))) {
                     continue;
@@ -450,7 +463,15 @@ class WatchingProblemCollector extends AbstractProblemCollector {
     tryFinish(line) {
         let result = false;
         for (const background of this.backgroundPatterns) {
+            const start = Date.now();
             const matches = background.end.regexp.exec(line);
+            const elapsed = Date.now() - start;
+            if (elapsed > 5) {
+                this.logService?.trace(
+                    `ProblemMatcher: slow end regexp took ${elapsed}ms to execute`,
+                    background.end.regexp.source
+                );
+            }
             if (matches) {
                 if (this._numberOfMatches > 0) {
                     this._onDidFindErrors.fire(this.markerService.read({

package/vscode/src/vs/workbench/contrib/tasks/common/problemMatcher.d.ts

@@ -7,6 +7,7 @@ import { IMarkerData } from "@codingame/monaco-vscode-api/vscode/vs/platform/mar
 import { ExtensionMessageCollector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare enum FileLocationKind {
     Default = 0,
     Relative = 1,
@@ -96,7 +97,7 @@ export interface ILineMatcher {
     next(line: string): IProblemMatch | null;
     handle(lines: string[], start?: number): IHandleResult;
 }
-export declare function createLineMatcher(matcher: ProblemMatcher, fileService?: IFileService): ILineMatcher;
+export declare function createLineMatcher(matcher: ProblemMatcher, fileService?: IFileService, logService?: ILogService): ILineMatcher;
 export declare namespace Config {
     interface IProblemPattern {
         /**
@@ -179,7 +180,7 @@ export declare namespace Config {
         regexp: string;
     }
     namespace CheckedProblemPattern {
-        function is(value: any): value is ICheckedProblemPattern;
+        function is(value: unknown): value is ICheckedProblemPattern;
     }
     interface INamedProblemPattern extends IProblemPattern {
         /**
@@ -192,7 +193,7 @@ export declare namespace Config {
         label?: string;
     }
     namespace NamedProblemPattern {
-        function is(value: any): value is INamedProblemPattern;
+        function is(value: unknown): value is INamedProblemPattern;
     }
     interface INamedCheckedProblemPattern extends INamedProblemPattern {
         /**
@@ -202,15 +203,15 @@ export declare namespace Config {
         regexp: string;
     }
     namespace NamedCheckedProblemPattern {
-        function is(value: any): value is INamedCheckedProblemPattern;
+        function is(value: unknown): value is INamedCheckedProblemPattern;
     }
     type MultiLineProblemPattern = IProblemPattern[];
     namespace MultiLineProblemPattern {
-        function is(value: any): value is MultiLineProblemPattern;
+        function is(value: unknown): value is MultiLineProblemPattern;
     }
     type MultiLineCheckedProblemPattern = ICheckedProblemPattern[];
     namespace MultiLineCheckedProblemPattern {
-        function is(value: any): value is MultiLineCheckedProblemPattern;
+        function is(value: unknown): value is MultiLineCheckedProblemPattern;
     }
     interface INamedMultiLineCheckedProblemPattern {
         /**
@@ -227,7 +228,7 @@ export declare namespace Config {
         patterns: MultiLineCheckedProblemPattern;
     }
     namespace NamedMultiLineCheckedProblemPattern {
-        function is(value: any): value is INamedMultiLineCheckedProblemPattern;
+        function is(value: unknown): value is INamedMultiLineCheckedProblemPattern;
     }
     type NamedProblemPatterns = (Config.INamedProblemPattern | Config.INamedMultiLineCheckedProblemPattern)[];
     /**