Skip to content

Commit 0bd2ab8

Browse files
authored
Revert "feat: add name de-mangling for C++ symbols in the Test Explorer" (#4658)
* Revert "feat: add name de-mangling for C++ symbols in the Test Explorer (#4340)" This reverts commit b084cc3. * Update CHANGELOG.md
1 parent 534bcc9 commit 0bd2ab8

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Bugs:
2020
- Migrate macOS CI from deprecated macOS-13 to macOS-15 Image [#4633](https://github.com/microsoft/vscode-cmake-tools/pull/4633)
2121
- Ensure Visual Studio developer environment propagation preserves `VCPKG_ROOT`, enabling vcpkg-dependent configure runs after using the Set Visual Studio Developer Environment command. [microsoft/vscode-cpptools#14083](https://github.com/microsoft/vscode-cpptools/issues/14083)
2222
- Fix auto-focusing the "Search" input field in the CMake Cache view. [#4552](https://github.com/microsoft/vscode-cmake-tools/pull/4552) [@simhof-basyskom](https://github.com/simhof-basyskom)
23+
- Remove the demangling feature in the code coverage implementation for now since it doesn't work properly.
2324

2425

2526
## 1.21
@@ -34,14 +35,13 @@ Features:
3435

3536
Improvements:
3637

37-
- 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)
3838
- 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)
3939
- Speedup & reduce heap allocations in shlex split module function. Significant gains for mid-large compile_commands.json - CompilationDatabase construction. [#4458](https://github.com/microsoft/vscode-cmake-tools/pull/4458) [@borjamunozf](https://github.com/borjamunozf)
4040

4141
Bug Fixes:
4242

4343
- Fix bug that makes `Configure Task` lists only first folder in workspace. [#3232](https//github.com/microsoft/vscode-cmake-tools/issues/3232)
44-
- 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)
44+
- 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)
4545
- 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)
4646
- 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)
4747
- Fixes localization for "workspace is" string. [#4374](https://github.com/microsoft/vscode-cmake-tools/issues/4374)

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,7 +3966,6 @@
39663966
"@types/chai": "^4.2.15",
39673967
"@types/chai-as-promised": "^7.1.3",
39683968
"@types/chai-string": "^1.4.2",
3969-
"@types/demangler-js": "^0.1.0",
39703969
"@types/js-yaml": "^4.0.0",
39713970
"@types/json5": "~0.0.30",
39723971
"@types/lodash": "4.14.202",
@@ -4021,7 +4020,6 @@
40214020
"@types/string.prototype.matchall": "^4.0.4",
40224021
"ajv": "^7.1.0",
40234022
"chokidar": "^3.5.1",
4024-
"demangler-js": "^0.1.7",
40254023
"handlebars": "^4.7.7",
40264024
"iconv-lite": "^0.6.2",
40274025
"js-yaml": "^4.1.1",

src/coverage.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as vscode from 'vscode';
22
import * as nls from 'vscode-nls';
33
import * as logging from '@cmt/logging';
4-
import { demangle } from 'demangler-js';
54
import { platformNormalizePath } from './util';
65

76
const { lcovParser } = require("@friedemannsommer/lcov-parser");
@@ -63,8 +62,7 @@ export async function handleCoverageInfoFiles(run: vscode.TestRun, coverageInfoF
6362

6463
const declarations: vscode.DeclarationCoverage[] = [];
6564
for (const declaration of section.functions.details) {
66-
const demangledName = demangle(declaration.name);
67-
declarations.push(new vscode.DeclarationCoverage(demangledName, declaration.hit,
65+
declarations.push(new vscode.DeclarationCoverage(declaration.name, declaration.hit,
6866
new vscode.Position(declaration.line - 1, 0)));
6967
}
7068

yarn.lock

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -559,11 +559,6 @@
559559
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/chai/-/chai-4.3.1.tgz"
560560
integrity sha512-/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ==
561561

562-
"@types/demangler-js@^0.1.0":
563-
version "0.1.0"
564-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/demangler-js/-/demangler-js-0.1.0.tgz#938a0f160ece42b3cf8d46f3b0ab1218f46821e6"
565-
integrity sha1-k4oPFg7OQrPPjUbzsKsSGPRoIeY=
566-
567562
"@types/estree@^1.0.5":
568563
version "1.0.6"
569564
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
@@ -2263,11 +2258,6 @@ delegates@^1.0.0:
22632258
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/delegates/-/delegates-1.0.0.tgz"
22642259
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
22652260

2266-
demangler-js@^0.1.7:
2267-
version "0.1.7"
2268-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/demangler-js/-/demangler-js-0.1.7.tgz#42454730da691746e35c5e8861900192be1cbc4d"
2269-
integrity sha1-QkVHMNppF0bjXF6IYZABkr4cvE0=
2270-
22712261
deprecation@^2.0.0, deprecation@^2.3.1:
22722262
version "2.3.1"
22732263
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/deprecation/-/deprecation-2.3.1.tgz"

0 commit comments

Comments
 (0)