From 97128122b06ee057b2e98cb017b853f999b08151 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Mon, 3 Feb 2025 11:57:35 -0800 Subject: [PATCH 1/3] Fix Select IntelliSense Configuration regression. (#13224) --- Extension/src/LanguageServer/client.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index b7564234c..f12662fca 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -1134,10 +1134,9 @@ export class DefaultClient implements Client { return ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompileCommands, showButtonSender); } else { action = "select compiler"; - const newCompiler: string = util.isCl(paths[index]) ? "cl.exe" : paths[index]; - + let newCompiler: string = util.isCl(paths[index]) ? "cl.exe" : paths[index]; + newCompiler = newCompiler.replace(/[\\/]/g, preferredPathSeparator); settings.defaultCompilerPath = newCompiler; - settings.defaultCompilerPath = settings.defaultCompilerPath.replace(/[\\/]/g, preferredPathSeparator); await this.configuration.updateCompilerPathIfSet(newCompiler); void SessionState.trustedCompilerFound.set(true); } From 471cdfecf84b1925bb9bc66fe7be482f5e5ffbbf Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Thu, 6 Feb 2025 10:31:49 -0800 Subject: [PATCH 2/3] don't abort instantly, keep searching (#13243) --- Extension/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extension/src/common.ts b/Extension/src/common.ts index dbd0bcdd6..e4ae353b0 100644 --- a/Extension/src/common.ts +++ b/Extension/src/common.ts @@ -1450,7 +1450,7 @@ export function findPowerShell(): string | undefined { return name; } } catch (e) { - return undefined; + // ignore, try next candidate } } } From a636c87f3e882038334501f488acea71645d39ef Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Thu, 6 Feb 2025 11:21:08 -0800 Subject: [PATCH 3/3] Update changelog for 1.23.6 (#13244) * Update changelog and version. --- Extension/CHANGELOG.md | 7 +++++++ Extension/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index 97a78a34b..7e7723219 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -1,5 +1,12 @@ # C/C++ for Visual Studio Code Changelog +## Version 1.23.6: February 6, 2025 +### Bug Fixes +* Fix a bug with remote attach debugging. [#13137](https://github.com/microsoft/vscode-cpptools/issues/13137) +* Fix symlink-related regression bugs. [#13214](https://github.com/microsoft/vscode-cpptools/issues/13214), [#13228](https://github.com/microsoft/vscode-cpptools/issues/13228) +* Fix a regression bug when using 'Select IntelliSense Configuration'. [#13220](https://github.com/microsoft/vscode-cpptools/issues/13220) +* Fix a regression bug with `files.associations` handling. [#13223](https://github.com/microsoft/vscode-cpptools/issues/13223) + ## Version 1.23.5: January 28, 2025 ### Enhancements * Modifications to the snippet completions to more closely match the snippets provided by TypeScript. [#4482](https://github.com/microsoft/vscode-cpptools/issues/4482) diff --git a/Extension/package.json b/Extension/package.json index fab08abde..2573b37cc 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -2,7 +2,7 @@ "name": "cpptools", "displayName": "C/C++", "description": "C/C++ IntelliSense, debugging, and code browsing.", - "version": "1.23.5-main", + "version": "1.23.6-main", "publisher": "ms-vscode", "icon": "LanguageCCPP_color_128x.png", "readme": "README.md",