master: review fixes

matepek · Feb 22, 2022 · acabb8b · acabb8b
1 parent 646c9c4
commit acabb8b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [4.0.26]
+
 ### Changed
 
 - improvements to the built-in default search pattern for waitForBuildProcess

diff --git a/documents/configuration/test.advancedExecutables.md b/documents/configuration/test.advancedExecutables.md
@@ -59,7 +59,7 @@ If it is an object it can contains the following properties:
 | `parallelizationLimit` | The variable maximize the number of the parallel execution of one executable instance. Note: `testMate.cpp.test.parallelExecutionLimit` is a global limit. [Detail](https://github.com/matepek/vscode-catch2-test-adapter/blob/master/documents/configuration/test.advancedExecutables.md)                                                                                                                    |
 | `strictPattern`        | Test loading fails if one of the files matched by `pattern` is not a test executable. (Helps noticing unexpected crashes/problems under test loading.)                                                                                                                                                                                                                                                        |
 | `markAsSkipped`        | If true then all the tests related to the pattern are skipped. They can be run manually though.                                                                                                                                                                                                                                                                                                               |
-| `waitForBuildProcess`  | (experimental) Prevents the extension of auto-reloading. With this linking failure might can be avoided.                                                                                                                                                                                                                                                                                                      |
+| `waitForBuildProcess`  | (experimental) Prevents the extension of auto-reloading. With this linking failure might can be avoided. Can be true to use a default pattern that works for most cases, or a string to pass your own search pattern (regex) for processes.                                                                                                                                                                   |
 | `catch2`               | Object with framework specific settings. [Detail](https://github.com/matepek/vscode-catch2-test-adapter/blob/master/documents/configuration/test.advancedExecutables.md#framework-specific-settings)                                                                                                                                                                                                          |
 | `gtest`                | Object with framework specific settings. [Detail](https://github.com/matepek/vscode-catch2-test-adapter/blob/master/documents/configuration/test.advancedExecutables.md#framework-specific-settings)                                                                                                                                                                                                          |
 | `doctest`              | Object with framework specific settings. [Detail](https://github.com/matepek/vscode-catch2-test-adapter/blob/master/documents/configuration/test.advancedExecutables.md#framework-specific-settings)                                                                                                                                                                                                          |

diff --git a/src/ConfigOfExecGroup.ts b/src/ConfigOfExecGroup.ts
@@ -465,11 +465,7 @@ export class ConfigOfExecGroup implements vscode.Disposable {
     }
 
     if (isFileExistsAndExecutable) {
-      if (this._waitForBuildProcess) {
-        await this._shared.buildProcessChecker.resolveAtFinish(
-          typeof this._waitForBuildProcess === 'string' ? this._waitForBuildProcess : undefined,
-        );
-      }
+      await this._shared.buildProcessChecker.resolveAtFinish(this._waitForBuildProcess);
 
       try {
         await executable.reloadTests(this._shared.taskPool, this._shared.cancellationToken);

diff --git a/src/util/BuildProcessChecker.ts b/src/util/BuildProcessChecker.ts
@@ -21,7 +21,9 @@ export class BuildProcessChecker {
     this._finishedResolver();
   }
 
-  resolveAtFinish(pattern: string | undefined): Promise<void> {
+  resolveAtFinish(pattern: string | boolean | undefined): Promise<void> {
+    if (pattern === false) return Promise.resolve();
+
     if (this._timerId !== undefined) {
       return this._finishedP;
     }
@@ -36,8 +38,8 @@ export class BuildProcessChecker {
       this._finishedResolver = r;
     });
 
-    this._log.info('Checking running build related processes');
-    const patternToUse = pattern ? RegExp(pattern) : this._defaultPattern;
+    const patternToUse = typeof pattern == 'string' ? RegExp(pattern) : this._defaultPattern;
+    this._log.info('Checking running build related processes', patternToUse);
     this._timerId = global.setInterval(this._refresh.bind(this, patternToUse), this._checkIntervalMillis);
     this._refresh(patternToUse);