From fed7a82d36ff37bbb0970eae3e9a5360bcafe2aa Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:48:14 -0800 Subject: [PATCH 1/3] Fix .editorConfig setting precedence (#13140) --- Extension/src/LanguageServer/client.ts | 2 ++ Extension/src/LanguageServer/editorConfig.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts index ac7a53bac..46e2b71ca 100644 --- a/Extension/src/LanguageServer/client.ts +++ b/Extension/src/LanguageServer/client.ts @@ -1285,6 +1285,8 @@ export class DefaultClient implements Client { void vscode.window.showErrorMessage(localize("unable.to.start", "Unable to start the C/C++ language server. IntelliSense features will be disabled. Error: {0}", additionalInfo)); } } + + this.updateActiveDocumentTextOptions(); } private async init(rootUri: vscode.Uri | undefined, isFirstClient: boolean) { diff --git a/Extension/src/LanguageServer/editorConfig.ts b/Extension/src/LanguageServer/editorConfig.ts index b5c8aa1db..4f330073a 100644 --- a/Extension/src/LanguageServer/editorConfig.ts +++ b/Extension/src/LanguageServer/editorConfig.ts @@ -165,8 +165,8 @@ function getEditorConfig(filePath: string): any { Object.keys(configData).forEach((section: string) => { if (section !== '*' && matchesSection(currentDirForwardSlashes, filePath, section)) { combinedConfig = { - ...combinedConfig, - ...configData[section] + ...configData[section], + ...combinedConfig }; } }); From 6f9ddbf52acf8b45262b4c179034b1f40afdd0b5 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 14 Jan 2025 10:39:45 -0800 Subject: [PATCH 2/3] Fix casing of Windows. (#13149) --- .../devcommandprompt/open-developer-command-prompt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md b/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md index 8c79c8320..e8af0926f 100644 --- a/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md +++ b/Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md @@ -1,5 +1,5 @@

Relaunch using the Developer Command Prompt for VS

-

You are using a windows machine with the MSVC compiler, so you need to start VS Code from the Developer Command Prompt for VS for all environment variables to be set correctly. To relaunch using the Developer Command Prompt for VS:

+

You are using a Windows machine with the MSVC compiler, so you need to start VS Code from the Developer Command Prompt for VS for all environment variables to be set correctly. To relaunch using the Developer Command Prompt for VS:

  1. Open the Developer Command Prompt for VS by typing "developer" in the Windows Start menu. Select the Developer Command Prompt for VS, which will automatically navigate to your current open folder.

    2. From c4d9f113864e2dedc1c8ce3edc1ff6f21cf7b607 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 15 Jan 2025 15:30:36 -0800 Subject: [PATCH 3/3] Update changelog and version for 1.23.4. (#13155) * Update changelog and version for 1.23.4. --- Extension/CHANGELOG.md | 13 +++++++++---- Extension/package.json | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index dbf651f47..c2a941a2e 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -1,12 +1,17 @@ # C/C++ for Visual Studio Code Changelog -## Version 1.23.3: January 9, 2025 -### New Feature -* Enable setting multiple compile commands. [#7029](https://github.com/microsoft/vscode-cpptools/issues/7029) - * Thank you for the contribution. [@yiftahw](https://github.com/yiftahw) [PR #12960](https://github.com/microsoft/vscode-cpptools/pull/12960) +## Version 1.23.4: January 16, 2025 +### Bug Fixes +* Fix a couple bugs with `.editorConfig` handling. [PR #13140](https://github.com/microsoft/vscode-cpptools/pull/13140) +* Fix a bug when processing a file with invalid multi-byte sequences. [#13150](https://github.com/microsoft/vscode-cpptools/issues/13150) +* Fix a crash when Copilot hover is used on code with no definition file (e.g. literals). +* Fix `libiconv.dll` not being signed on Windows. +## Version 1.23.3: January 9, 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) +* Enable setting multiple compile commands. [#7029](https://github.com/microsoft/vscode-cpptools/issues/7029) + * Thank you for the contribution. [@yiftahw](https://github.com/yiftahw) [PR #12960](https://github.com/microsoft/vscode-cpptools/pull/12960) * Update clang path setting descriptions. [PR #13071](https://github.com/microsoft/vscode-cpptools/pull/13071) * Update clang-format and clang-tidy from 19.1.5 to 19.1.6. * IntelliSense parser updates. diff --git a/Extension/package.json b/Extension/package.json index 03facfe22..db1fb79e1 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.3-main", + "version": "1.23.4-main", "publisher": "ms-vscode", "icon": "LanguageCCPP_color_128x.png", "readme": "README.md",