Skip to content

Merge to vs #13653

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 8 commits into from
May 29, 2025
Merged

Merge to vs #13653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b815f8c
Remove -D__building_module(x)=0 workaround. (#13621)
sean-mcmanus May 21, 2025
50da8ef
add note about C++ Copilot suggestions improvement (#13624)
lukka May 21, 2025
07de41e
Update changelog for 1.26.1 (#13627)
sean-mcmanus May 22, 2025
8ca1c45
fix typo (#13630)
heartacker May 23, 2025
266f2d7
Remove the .type.descriptions since they don't seem to have any effec…
sean-mcmanus May 29, 2025
ca78565
Lock the PATH variable which was incorrectly being translated. (#13649)
sean-mcmanus May 29, 2025
8452054
Fix a couple loc issues. (#13650)
sean-mcmanus May 29, 2025
d949d36
Merge branch 'main' into seanmcm/vsMerge
sean-mcmanus May 29, 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
16 changes: 13 additions & 3 deletions Extension/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
# C/C++ for Visual Studio Code Changelog

## Version 1.26.0: May 22, 2025
### Enhancement
## Version 1.26.1: May 22, 2025
### Bug Fixes
* Fix include completion adding an extra `"` in `insert` mode. [#13615](https://github.com/microsoft/vscode-cpptools/issues/13615)
* Fix a bug with compiler querying of MinGW. [#13622](https://github.com/microsoft/vscode-cpptools/issues/13622)
* Fix a tag parser crash regression.

## Version 1.26.0: May 21, 2025
### New Feature
* Improve the context provided for C++ Copilot suggestions.

### Enhancements
* Add support for c++26/2c, gnu++26/2c, and c++23preview configurations. [#12963](https://github.com/microsoft/vscode-cpptools/issues/12963), [#13133](https://github.com/microsoft/vscode-cpptools/issues/13133)
* IntelliSense parser updates.

### Bug Fixes
* Fix an invalid IntelliSense error with C++23 escape sequences. [#13338](https://github.com/microsoft/vscode-cpptools/issues/13338)
Expand Down Expand Up @@ -2543,4 +2553,4 @@

## Version 0.5.0: April 14, 2016
* Usability and correctness bug fixes.
* Simplify installation experience.
* Simplify installation experience.
27 changes: 13 additions & 14 deletions Extension/bin/linux.clang.arm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"defaults": [
"-D__building_module(x)=0",
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__arm__=1",
"-D__ARM_32BIT_STATE=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__arm__=1",
"-D__ARM_32BIT_STATE=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
27 changes: 13 additions & 14 deletions Extension/bin/linux.clang.arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"defaults": [
"-D__building_module(x)=0",
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__aarch64__=1",
"-D__ARM_64BIT_STATE=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__aarch64__=1",
"-D__ARM_64BIT_STATE=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
27 changes: 13 additions & 14 deletions Extension/bin/linux.clang.x64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"defaults": [
"-D__building_module(x)=0",
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__x86_64=1",
"-D__x86_64__=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__x86_64=1",
"-D__x86_64__=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
27 changes: 13 additions & 14 deletions Extension/bin/linux.clang.x86.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"defaults": [
"-D__building_module(x)=0",
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__i386=1",
"-D__i386__=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-Dunix=1",
"-D__unix__=1",
"-D__linux__=1",
"-D__i386=1",
"-D__i386__=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
25 changes: 12 additions & 13 deletions Extension/bin/macos.clang.arm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"defaults": [
"-D__building_module(x)=0",
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__arm__=1",
"-D__ARM_32BIT_STATE=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__arm__=1",
"-D__ARM_32BIT_STATE=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
25 changes: 12 additions & 13 deletions Extension/bin/macos.clang.arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"defaults": [
"-D__building_module(x)=0",
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__aarch64__=1",
"-D__ARM_64BIT_STATE=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__aarch64__=1",
"-D__ARM_64BIT_STATE=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
25 changes: 12 additions & 13 deletions Extension/bin/macos.clang.x64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"defaults": [
"-D__building_module(x)=0",
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__x86_64=1",
"-D__x86_64__=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__x86_64=1",
"-D__x86_64__=1",
"-D__PTRDIFF_TYPE__=long int",
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op": "merge"
}
25 changes: 12 additions & 13 deletions Extension/bin/macos.clang.x86.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"defaults": [
"-D__building_module(x)=0",
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__i386=1",
"-D__i386__=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
{
"defaults": [
"-D__APPLE__=1",
"-D__MACH__=1",
"-D__i386=1",
"-D__i386__=1",
"-D__PTRDIFF_TYPE__=int",
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op": "merge"
}
11 changes: 5 additions & 6 deletions Extension/bin/windows.clang.arm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"defaults": [
"-D__building_module(x)=0"
],
"defaults_op": "merge"
}
{
"defaults": [
],
"defaults_op": "merge"
}
11 changes: 5 additions & 6 deletions Extension/bin/windows.clang.arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"defaults": [
"-D__building_module(x)=0"
],
"defaults_op": "merge"
}
{
"defaults": [
],
"defaults_op": "merge"
}
11 changes: 5 additions & 6 deletions Extension/bin/windows.clang.x64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"defaults": [
"-D__building_module(x)=0"
],
"defaults_op": "merge"
}
{
"defaults": [
],
"defaults_op": "merge"
}
11 changes: 5 additions & 6 deletions Extension/bin/windows.clang.x86.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"defaults": [
"-D__building_module(x)=0"
],
"defaults_op": "merge"
}
{
"defaults": [
],
"defaults_op": "merge"
}
2 changes: 1 addition & 1 deletion Extension/i18n/ita/src/LanguageServer/configurations.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"unknown.properties.version": "È stato trovato un numero di versione sconosciuto in c_cpp_properties.json. Alcune funzionalità potrebbero non funzionare come previsto.",
"update.properties.failed": "Il tentativo di aggiornamento di \"{0}\" non è riuscito. L'accesso in scrittura è disponibile?",
"failed.to.parse.properties": "Non è stato possibile analizzare \"{0}\"",
"path.with.spaces": "Il percorso del compilatore con spazi e argomenti non è racchiuso tra virgolette doppie ({0}).",
"path.with.spaces": "Non è possibile trovare il percorso del compilatore contenente spazi. Se l'intenzione era includere argomenti del compilatore, racchiudi il percorso del compilatore tra doppie virgolette ({0})",
"cannot.find": "Non è possibile trovare: {0}",
"path.is.not.a.file": "Il percorso non è un file: {0}",
"wrapped.with.quotes": "Non aggiungere virgolette aggiuntive intorno ai percorsi.",
Expand Down
2 changes: 1 addition & 1 deletion Extension/i18n/trk/package.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@
"c_cpp.walkthrough.set.up.title": "C++ Ortamınızı kurun",
"c_cpp.walkthrough.activating.description": "C++ Ortamınızın kurulup kurulmadığını belirlemek için C++ uzantısını etkinleştirme.\nUzantı Etkinleştiriliyor...",
"c_cpp.walkthrough.no.compilers.windows.description": "Makinenizde C++ uzantısını kullanmak için gerekli olan bir C++ derleyicisi bulamadık. Bir tane yüklemek için sağdaki talimatları izleyin, ardından aşağıdaki “Yeni Derleyicimi bul” seçeneğine tıklayın.\n[Yeni Derleyicimi bul](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
"c_cpp.walkthrough.no.compilers.description": "Makinenizde C++ uzantısını kullanmak için gerekli olan bir C++ derleyicisi bulamadık. Sizin için bir derleyicinin kurulmasını sağlamak için “C++ Derleyicisi Kur”u seçin veya bir derleyiciyi kurmak için sağdaki yönergeleri izleyin ve ardından aşağıdaki “Yeni Derleyicimi Bul”a tıklayın.\n[Bir C++ Derleyicisi yükle](command:C_Cpp.RescanCompilers?%22walkthrough%22)\n[Yeni Derleyicimi bul](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
"c_cpp.walkthrough.no.compilers.description": "Makinenizde C++ uzantısını kullanmak için gerekli olan bir C++ derleyicisi bulamadık. Sizin için bir derleyicinin kurulmasını sağlamak için “C++ Derleyicisi Kur”u seçin veya bir derleyiciyi kurmak için sağdaki yönergeleri izleyin ve ardından aşağıdaki “Yeni Derleyicimi Bul”a tıklayın.\n[Bir C++ Derleyicisi yükle](command:C_Cpp.InstallCompiler?%22walkthrough%22)\n[Yeni Derleyicimi bul](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
"c_cpp.walkthrough.compilers.found.description": "C++ uzantısı, bir C++ derleyicisiyle çalışır. Aşağıdaki düğmeyi tıklayarak makinenizde zaten bulunanlardan birini seçin.\n[Varsayılan Derleyicimi seç](command:C_Cpp.SelectIntelliSenseConfiguration?%22walkthrough%22)",
"c_cpp.walkthrough.compilers.found.altText": "Varsayılan bir derleyici seçme hızlı seçimini ve kullanıcının makinesinde bulunan ve biri seçili olan derleyicilerin listesini gösteren resim.",
"c_cpp.walkthrough.create.cpp.file.title": "C++ dosyası oluşturun",
Expand Down
22 changes: 1 addition & 21 deletions 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.0-main",
"version": "1.26.1-main",
"publisher": "ms-vscode",
"icon": "LanguageCCPP_color_128x.png",
"readme": "README.md",
Expand Down Expand Up @@ -3662,11 +3662,6 @@
},
"default": []
},
"type": {
"type": "string",
"description": "%c_cpp.debuggers.cppdbg.type.description%",
"default": "cppdbg"
},
"targetArchitecture": {
"type": "string",
"description": "%c_cpp.debuggers.targetArchitecture.description%",
Expand Down Expand Up @@ -4611,11 +4606,6 @@
"description": "%c_cpp.debuggers.program.description%",
"default": "${workspaceRoot}/a.out"
},
"type": {
"type": "string",
"description": "%c_cpp.debuggers.cppdbg.type.description%",
"default": "cppdbg"
},
"targetArchitecture": {
"type": "string",
"description": "%c_cpp.debuggers.targetArchitecture.description%",
Expand Down Expand Up @@ -5426,11 +5416,6 @@
},
"default": []
},
"type": {
"type": "string",
"description": "%c_cpp.debuggers.cppvsdbg.type.description%",
"default": "cppvsdbg"
},
"cwd": {
"type": "string",
"description": "%c_cpp.debuggers.cwd.description%",
Expand Down Expand Up @@ -5640,11 +5625,6 @@
"processId"
],
"properties": {
"type": {
"type": "string",
"description": "%c_cpp.debuggers.cppvsdbg.type.description%",
"default": "cppvsdbg"
},
"symbolSearchPath": {
"type": "string",
"description": "%c_cpp.debuggers.symbolSearchPath.description%",
Expand Down
Loading