Skip to content

Cherry-pick for 1.26.5 #13919

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
merged 2 commits into from
Sep 10, 2025
Merged

Cherry-pick for 1.26.5 #13919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42f7302
Wait maximum 3 seconds for the Copilot chat extension to activate. (#…
dbaeumer Sep 10, 2025
a1fa61e
Update changelog and version for 1.26.5.
sean-mcmanus Sep 10, 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
6 changes: 6 additions & 0 deletions Extension/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# C/C++ for Visual Studio Code Changelog

## Version 1.26.5: September 10, 2025
### Bug Fix
* Fix extension activation getting stuck by GitHub Copilot activation. [#13914](https://github.com/microsoft/vscode-cpptools/issues/13914)
* Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer) [PR #13918](https://github.com/microsoft/vscode-cpptools/pull/13918)

## Version 1.26.4: September 8, 2025
### Enhancement
* Update GitHub Copilot APIs. [PR #13877](https://github.com/microsoft/vscode-cpptools/pull/13877)
* Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer)

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.26.4-main",
"version": "1.26.5-main",
"publisher": "ms-vscode",
"icon": "LanguageCCPP_color_128x.png",
"readme": "README.md",
Expand Down
9 changes: 8 additions & 1 deletion Extension/src/LanguageServer/copilotProviders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,14 @@ export async function getCopilotChatApi(): Promise<CopilotContextProviderAPI | u
let exports: CopilotChatApi | undefined;
if (!copilotExtension.isActive) {
try {
exports = await copilotExtension.activate();
exports = await Promise.race([
copilotExtension.activate(),
new Promise<undefined>(resolve => {
setTimeout(() => {
resolve(undefined);
}, 3000);
})
]);
} catch {
return undefined;
}
Expand Down