Merge branch 'main' into issue-4404-utility-target-shadowing

Author: malsyned

.devcontainer/devcontainer.json

@@ -9,7 +9,7 @@
     "settings": {
         "terminal.integrated.shell.linux": "/bin/bash"
     },
-    "extensions": [
+    "extensions": [true][
         "ms-vscode.cpptools"
     ]
-}
+}

CHANGELOG.md

@@ -11,18 +11,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)
 - Fix incorrect IntelliSense configuration when a `UTILITY` has source files. [#4404](https://github.com/microsoft/vscode-cmake-tools/issues/4404)
 
 ## 1.20.53

package.json

@@ -2264,6 +2264,12 @@
           "markdownDescription": "%cmake-tools.configuration.cmake.ctest.testSuiteDelimiter.markdownDescription%",
           "scope": "machine-overridable"
         },
+        "cmake.ctest.testSuiteDelimiterMaxOccurrence": {
+          "type": "number",
+          "default": 0,
+          "markdownDescription": "%cmake-tools.configuration.cmake.ctest.testSuiteDelimiterMaxOccurrence.markdownDescription%",
+          "scope": "machine-overridable"
+        },
         "cmake.ctest.debugLaunchTarget": {
           "type": "string",
           "default": null,
@@ -3784,6 +3790,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",
@@ -3834,10 +3841,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",

package.nls.json

@@ -127,6 +127,9 @@
             "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
         ]
     }, 
+    "cmake-tools.configuration.cmake.ctest.testSuiteDelimiterMaxOccurrence.markdownDescription": {
+        "message": "Maximum number of times the delimiter may be used to split the name of the test. `0` means no limit."
+    },
 	"cmake-tools.configuration.cmake.ctest.debugLaunchTarget.description": "Target name from launch.json to start when debugging a test with CTest. By default and in case of a non-existing target, this will show a picker with all available targets.",
     "cmake-tools.configuration.cmake.parseBuildDiagnostics.description": "Parse compiler output for warnings and errors.",
     "cmake-tools.configuration.cmake.enabledOutputParsers.description": {

src/cmakeExecutable.ts

@@ -3,6 +3,7 @@ import * as util from '@cmt/util';
 import {setContextAndStore} from '@cmt/extension';
 import * as logging from '@cmt/logging';
 import * as nls from 'vscode-nls';
+import { ConfigurationReader } from './config';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@@ -24,7 +25,7 @@ export interface CMakeExecutable {
 
 const cmakeInfo = new Map<string, CMakeExecutable>();
 
-export async function getCMakeExecutableInformation(path: string): Promise<CMakeExecutable> {
+export async function getCMakeExecutableInformation(path: string, config?: ConfigurationReader): Promise<CMakeExecutable> {
     const cmake: CMakeExecutable = {
         path,
         isPresent: false,
@@ -50,7 +51,7 @@ export async function getCMakeExecutableInformation(path: string): Promise<CMake
         }
 
         try {
-            const execOpt: proc.ExecutionOptions = { showOutputOnError: true };
+            const execOpt: proc.ExecutionOptions = { showOutputOnError: true, environment: config?.environment };
             const execVersion = await proc.execute(path, ['--version'], null, execOpt).result;
             if (execVersion.retc === 0 && execVersion.stdout) {
                 console.assert(execVersion.stdout);

src/config.ts

@@ -174,7 +174,7 @@ export interface ExtensionConfigurationSettings {
     buildToolArgs: string[];
     parallelJobs: number;
     ctestPath: string;
-    ctest: { parallelJobs: number; allowParallelJobs: boolean; testExplorerIntegrationEnabled: boolean; testSuiteDelimiter: string; debugLaunchTarget: string | null };
+    ctest: { parallelJobs: number; allowParallelJobs: boolean; testExplorerIntegrationEnabled: boolean; testSuiteDelimiter: string; testSuiteDelimiterMaxOccurrence: number; debugLaunchTarget: string | null };
     parseBuildDiagnostics: boolean;
     enabledOutputParsers: string[];
     debugConfig: CppDebugConfiguration;
@@ -394,6 +394,9 @@ export class ConfigurationReader implements vscode.Disposable {
     get testSuiteDelimiter(): string {
         return this.configData.ctest.testSuiteDelimiter;
     }
+    get testSuiteDelimiterMaxOccurrence(): number {
+        return this.configData.ctest.testSuiteDelimiterMaxOccurrence;
+    }
     get ctestDebugLaunchTarget(): string | null {
         return this.configData.ctest.debugLaunchTarget;
     }
@@ -621,7 +624,7 @@ export class ConfigurationReader implements vscode.Disposable {
         parallelJobs: new vscode.EventEmitter<number>(),
         ctestPath: new vscode.EventEmitter<string>(),
         cpackPath: new vscode.EventEmitter<string>(),
-        ctest: new vscode.EventEmitter<{ parallelJobs: number; allowParallelJobs: boolean; testExplorerIntegrationEnabled: boolean; testSuiteDelimiter: string; debugLaunchTarget: string | null }>(),
+        ctest: new vscode.EventEmitter<{ parallelJobs: number; allowParallelJobs: boolean; testExplorerIntegrationEnabled: boolean; testSuiteDelimiter: string; testSuiteDelimiterMaxOccurrence: number; debugLaunchTarget: string | null }>(),
         parseBuildDiagnostics: new vscode.EventEmitter<boolean>(),
         enabledOutputParsers: new vscode.EventEmitter<string[]>(),
         debugConfig: new vscode.EventEmitter<CppDebugConfiguration>(),

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/ctest.ts

@@ -694,10 +694,30 @@ export class CTestDriver implements vscode.Disposable {
         let parentSuiteItem = testExplorerRoot;
         let testLabel = testName;
 
+        function limited_split(regexString: string, subject: string, maxCount: number): string[] {
+            if (maxCount === 0) {
+                maxCount = Number.MAX_SAFE_INTEGER;
+            }
+            const delimiterRegExp = new RegExp(regexString, 'dg');
+            const parts = [];
+            let lastStart = 0;
+            while (parts.length < maxCount) {
+                const match: any = delimiterRegExp.exec(subject);
+                if (match === null || match.indices === null) {
+                    break;
+                }
+
+                parts.push(subject.substring(lastStart, match.indices[0][0]));
+                lastStart = match.indices[0][1];
+            }
+
+            parts.push(subject.substring(lastStart));
+            return parts;
+        }
+
         // If a suite delimiter is set, create a suite tree
         if (this.ws.config.testSuiteDelimiter) {
-            const delimiterRegExp = new RegExp(this.ws.config.testSuiteDelimiter);
-            const parts = testName.split(delimiterRegExp);
+            const parts = limited_split(this.ws.config.testSuiteDelimiter, testName, this.ws.config.testSuiteDelimiterMaxOccurrence);
             testLabel = parts.pop() || testName; // The last part is the test label
 
             // Create a suite item for each suite ID part if it doesn't exist yet at that tree level

src/extension.ts

@@ -146,7 +146,7 @@ export class ExtensionManager implements vscode.Disposable {
             cmakePath = await workspaceContext.getCMakePath() || '';
         }
         // initialize the state of the cmake exe
-        await getCMakeExecutableInformation(cmakePath);
+        await getCMakeExecutableInformation(cmakePath, this.workspaceConfig);
 
         await util.setContextValue("cmake:testExplorerIntegrationEnabled", this.workspaceConfig.testExplorerIntegrationEnabled);
         this.workspaceConfig.onChange("ctest", async (value) => {

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');