Skip to content

Merge for 1.23.4 (pre-release) #13156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sean-mcmanus merged 3 commits into from
Jan 15, 2025
Merged

Merge for 1.23.4 (pre-release) #13156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed7a82
Fix .editorConfig setting precedence (#13140)
Colengms Jan 10, 2025
6f9ddbf
Fix casing of Windows. (#13149)
sean-mcmanus Jan 14, 2025
c4d9f11
Update changelog and version for 1.23.4. (#13155)
sean-mcmanus Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Extension/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions Extension/src/LanguageServer/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions Extension/src/LanguageServer/editorConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}
});
Expand Down
2 changes: 1 addition & 1 deletion Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1 data-loc-id="walkthrough.windows.title.open.dev.command.prompt">Relaunch using the <span>Developer Command Prompt for VS</span></h1>
<p data-loc-id="walkthrough.windows.background.dev.command.prompt"> You are using a windows machine with the MSVC compiler, so you need to start VS Code from the <span>Developer Command Prompt for VS</span> for all environment variables to be set correctly. To relaunch using the <span>Developer Command Prompt for VS</span>:</p>
<p data-loc-id="walkthrough.windows.background.dev.command.prompt"> You are using a Windows machine with the MSVC compiler, so you need to start VS Code from the <span>Developer Command Prompt for VS</span> for all environment variables to be set correctly. To relaunch using the <span>Developer Command Prompt for VS</span>:</p>
<ol>
<li><p data-loc-id="walkthrough.open.command.prompt">Open the <span>Developer Command Prompt for VS</span> by typing "<span>developer</span>" in the Windows Start menu. Select the <span>Developer Command Prompt for VS</span>, which will automatically navigate to your current open folder.</p>
</li>
Expand Down
Loading