Merge branch 'main' into failure-patterns

This is to get the flaky mac CI test fix

Author: malsyned

CHANGELOG.md

@@ -12,19 +12,21 @@ Features:
 
 Improvements:
 
+- Add name de-mangling for C++ symbols in the Test Explorer view when running tests with coverage. [#4340](https://github.com/microsoft/vscode-cmake-tools/pull/4340) [@rjaegers](https://github.com/rjaegers)
 - No longer convert paths on lowercase on MacOS to enable cpp tools to resolve them. [#4325](https://github.com/microsoft/vscode-cmake-tools/pull/4325) [@tringenbach](https://github.com/tringenbach)
 
 Bug Fixes:
 
 - Fix bug that makes `Configure Task` lists only first folder in workspace. [#3232](https//github.com/microsoft/vscode-cmake-tools/issues/3232)
-- Fix displaying "Go to Test" in the Test Explorer when the DEF_SOURCE_LINE property is set, but there is no backtrace information present. [4321](https://github.com/microsoft/vscode-cmake-tools/pull/4321) [@rjaegers](https://github.com/rjaegers)
+- Fix displaying "Go to Test" in the Test Explorer when the DEF_SOURCE_LINE property is set, but there is no backtrace information present. [#4321](https://github.com/microsoft/vscode-cmake-tools/pull/4321) [@rjaegers](https://github.com/rjaegers)
 - Fix gnuld error parsing false positive on make errors, false negative due to trailing \r, and false parsing of new "multiple definitions" error [#2864](https://github.com/microsoft/vscode-cmake-tools/issues/2864) [@0xemgy](https://github.com/0xemgy)
 - Fixes for small bug string bugs. [#4319](https://github.com/microsoft/vscode-cmake-tools/issues/4319), [#4317](https://github.com/microsoft/vscode-cmake-tools/issues/4317), [#4312](https://github.com/microsoft/vscode-cmake-tools/issues/4312)
 - Fixes localization for "workspace is" string. [#4374](https://github.com/microsoft/vscode-cmake-tools/issues/4374)
 - Make tooltips for selecting Launch/Debug Target. [#4373](https://github.com/microsoft/vscode-cmake-tools/issues/4373)
 - Fix bug where unrelated symlinks are read as variant files [#4304](https://github.com/microsoft/vscode-cmake-tools/issues/4304) [@vitorramos](https://github.com/vitorramos).
 - Fix evaluation of conditions in presets. [#4425](https://github.com/microsoft/vscode-cmake-tools/issues/4425)
 - Fix ENOENT error at vscode startup on some circumstances [#2855](https://github.com/microsoft/vscode-cmake-tools/issues/2855) Contributed by STMicroelectronics
+- Fix repeat execution option in test presets [#4443](https://github.com/microsoft/vscode-cmake-tools/issues/4443)
 
 ## 1.20.53
 

package.json

@@ -3852,6 +3852,7 @@
     "@types/chai": "^4.2.15",
     "@types/chai-as-promised": "^7.1.3",
     "@types/chai-string": "^1.4.2",
+    "@types/demangler-js": "^0.1.0",
     "@types/js-yaml": "^4.0.0",
     "@types/json5": "~0.0.30",
     "@types/lodash": "4.14.202",
@@ -3902,10 +3903,11 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@friedemannsommer/lcov-parser": "^4.0.1",
+    "@friedemannsommer/lcov-parser": "^5.0.0",
     "@types/string.prototype.matchall": "^4.0.4",
     "ajv": "^7.1.0",
     "chokidar": "^3.5.1",
+    "demangler-js": "^0.1.7",
     "handlebars": "^4.7.7",
     "iconv-lite": "^0.6.2",
     "js-yaml": "^4.0.0",

src/coverage.ts

@@ -1,9 +1,11 @@
 import * as vscode from 'vscode';
-import { lcovParser } from "@friedemannsommer/lcov-parser";
 import * as nls from 'vscode-nls';
 import * as logging from '@cmt/logging';
+import { demangle } from 'demangler-js';
 import { platformNormalizePath } from './util';
 
+const { lcovParser } = require("@friedemannsommer/lcov-parser");
+
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
@@ -61,7 +63,8 @@ export async function handleCoverageInfoFiles(run: vscode.TestRun, coverageInfoF
 
             const declarations: vscode.DeclarationCoverage[] = [];
             for (const declaration of section.functions.details) {
-                declarations.push(new vscode.DeclarationCoverage(declaration.name, declaration.hit,
+                const demangledName = demangle(declaration.name);
+                declarations.push(new vscode.DeclarationCoverage(demangledName, declaration.hit,
                     new vscode.Position(declaration.line - 1, 0)));
             }
 

src/presets/preset.ts

@@ -2391,7 +2391,7 @@ export function testArgs(preset: TestPreset): string[] {
         preset.execution.resourceSpecFile && result.push('--resource-spec-file', preset.execution.resourceSpecFile);
         preset.execution.testLoad && result.push('--test-load', preset.execution.testLoad.toString());
         preset.execution.showOnly && result.push('--show-only', preset.execution.showOnly);
-        preset.execution.repeat && result.push(`--repeat ${preset.execution.repeat.mode}:${preset.execution.repeat.count}`);
+        preset.execution.repeat && result.push('--repeat', `${preset.execution.repeat.mode}:${preset.execution.repeat.count}`);
         preset.execution.interactiveDebugging && result.push('--interactive-debug-mode 1');
         preset.execution.interactiveDebugging === false && result.push('--interactive-debug-mode 0');
         preset.execution.scheduleRandom && result.push('--schedule-random');

test/end-to-end-tests/single-root-UI/test/coverage.test.ts

@@ -67,8 +67,11 @@ suite('Coverage integration', () => {
         await vscode.workspace.getConfiguration('cmake', vscode.workspace.workspaceFolders![0].uri).update('postRunCoverageTarget', 'capture-coverage');
 
         const testResult: any = await vscode.commands.executeCommand('testing.coverage.uri', vscode.Uri.file(testEnv.projectFolder.location));
-        expect(testResult['tasks'][0].hasCoverage).to.be.eq(true);
-        expect(testResult['items'][2].computedState).to.be.eq(TestResultState.Passed);
+        if (testResult !== undefined) {
+            // May or may not be undefined in this case evidently based on platform
+            expect(testResult['tasks'][0].hasCoverage).to.be.eq(true);
+            expect(testResult['items'][2].computedState).to.be.eq(TestResultState.Passed);
+        }
         expect(fs.existsSync(path.join(testEnv.projectFolder.location, testEnv.buildLocation, 'lcov.info'))).to.be.true;
     }).timeout(60000);
 });

yarn.lock

@@ -165,10 +165,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@friedemannsommer/lcov-parser@^4.0.1":
-  version "4.0.1"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@friedemannsommer/lcov-parser/-/lcov-parser-4.0.1.tgz#192445df2095bb061fd889ea0b0f0f94bf7c58b7"
-  integrity sha512-NjXrxLeh77FUAL6TzVJyvYvgA2AS+t2hlfRmfOyE5HR3g+2HdLNFTP2l+zTypn5JTnV4jfXgwSO46JLhvJeXlw==
+"@friedemannsommer/lcov-parser@^5.0.0":
+  version "5.0.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@friedemannsommer/lcov-parser/-/lcov-parser-5.0.0.tgz#dbda48ac22ece7f3d5df7fb183d68267025eccf4"
+  integrity sha512-YeK97qJgG/AEPee19qA1TtAFgXR1OSjKK9nIOnUPVF3eLFam+VMRii1GGtG60uAeqSWaGwBkTQ6RvYkSULDrTA==
 
 "@gulp-sourcemaps/identity-map@^2.0.1":
   version "2.0.1"
@@ -547,6 +547,11 @@
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/chai/-/chai-4.3.1.tgz"
   integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
 
+"@types/demangler-js@^0.1.0":
+  version "0.1.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/demangler-js/-/demangler-js-0.1.0.tgz#938a0f160ece42b3cf8d46f3b0ab1218f46821e6"
+  integrity sha1-k4oPFg7OQrPPjUbzsKsSGPRoIeY=
+
 "@types/estree@^1.0.5":
   version "1.0.6"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
@@ -2232,6 +2237,11 @@ delegates@^1.0.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/delegates/-/delegates-1.0.0.tgz"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+demangler-js@^0.1.7:
+  version "0.1.7"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/demangler-js/-/demangler-js-0.1.7.tgz#42454730da691746e35c5e8861900192be1cbc4d"
+  integrity sha1-QkVHMNppF0bjXF6IYZABkr4cvE0=
+
 deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/deprecation/-/deprecation-2.3.1.tgz"