Skip to content

Commit 5e3ef1c

Browse files
sean-mcmanuslukkaheartacker
authored
Merge to vs (#13653)
* Remove -D__building_module(x)=0 workaround. (#13621) * add note about C++ Copilot suggestions improvement (#13624) * Update changelog for 1.26.1 (#13627) * Update changelog for 1.26.1 * fix typo (#13630) 1.26.0->1.26.1 * Remove the .type.descriptions since they don't seem to have any effect. (#13648) * Lock the PATH variable which was incorrectly being translated. (#13649) * Fix a couple loc issues. (#13650) --------- Co-authored-by: Luca <681992+lukka@users.noreply.github.com> Co-authored-by: heartacker <1876302+heartacker@users.noreply.github.com>
2 parents 0d976f5 + d949d36 commit 5e3ef1c

18 files changed

+155
-184
lines changed

‎Extension/CHANGELOG.md‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# C/C++ for Visual Studio Code Changelog
22

3-
## Version 1.26.0: May 22, 2025
4-
### Enhancement
3+
## Version 1.26.1: May 22, 2025
4+
### Bug Fixes
5+
* Fix include completion adding an extra `"` in `insert` mode. [#13615](https://github.com/microsoft/vscode-cpptools/issues/13615)
6+
* Fix a bug with compiler querying of MinGW. [#13622](https://github.com/microsoft/vscode-cpptools/issues/13622)
7+
* Fix a tag parser crash regression.
8+
9+
## Version 1.26.0: May 21, 2025
10+
### New Feature
11+
* Improve the context provided for C++ Copilot suggestions.
12+
13+
### Enhancements
514
* 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)
15+
* IntelliSense parser updates.
616

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

25442554
## Version 0.5.0: April 14, 2016
25452555
* Usability and correctness bug fixes.
2546-
* Simplify installation experience.
2556+
* Simplify installation experience.

‎Extension/bin/linux.clang.arm.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__arm__=1",
8-
"-D__ARM_32BIT_STATE=1",
9-
"-D__PTRDIFF_TYPE__=int",
10-
"-D__SIZE_TYPE__=unsigned int",
11-
"-D__WCHAR_TYPE__=long int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__arm__=1",
7+
"-D__ARM_32BIT_STATE=1",
8+
"-D__PTRDIFF_TYPE__=int",
9+
"-D__SIZE_TYPE__=unsigned int",
10+
"-D__WCHAR_TYPE__=long int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.arm64.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__aarch64__=1",
8-
"-D__ARM_64BIT_STATE=1",
9-
"-D__PTRDIFF_TYPE__=long int",
10-
"-D__SIZE_TYPE__=long unsigned int",
11-
"-D__WCHAR_TYPE__=int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__aarch64__=1",
7+
"-D__ARM_64BIT_STATE=1",
8+
"-D__PTRDIFF_TYPE__=long int",
9+
"-D__SIZE_TYPE__=long unsigned int",
10+
"-D__WCHAR_TYPE__=int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.x64.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__x86_64=1",
8-
"-D__x86_64__=1",
9-
"-D__PTRDIFF_TYPE__=long int",
10-
"-D__SIZE_TYPE__=long unsigned int",
11-
"-D__WCHAR_TYPE__=int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__x86_64=1",
7+
"-D__x86_64__=1",
8+
"-D__PTRDIFF_TYPE__=long int",
9+
"-D__SIZE_TYPE__=long unsigned int",
10+
"-D__WCHAR_TYPE__=int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/linux.clang.x86.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-Dunix=1",
5-
"-D__unix__=1",
6-
"-D__linux__=1",
7-
"-D__i386=1",
8-
"-D__i386__=1",
9-
"-D__PTRDIFF_TYPE__=int",
10-
"-D__SIZE_TYPE__=unsigned int",
11-
"-D__WCHAR_TYPE__=long int"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-Dunix=1",
4+
"-D__unix__=1",
5+
"-D__linux__=1",
6+
"-D__i386=1",
7+
"-D__i386__=1",
8+
"-D__PTRDIFF_TYPE__=int",
9+
"-D__SIZE_TYPE__=unsigned int",
10+
"-D__WCHAR_TYPE__=long int"
11+
],
12+
"defaults_op": "merge"
13+
}

‎Extension/bin/macos.clang.arm.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__arm__=1",
7-
"-D__ARM_32BIT_STATE=1",
8-
"-D__PTRDIFF_TYPE__=int",
9-
"-D__SIZE_TYPE__=unsigned int",
10-
"-D__WCHAR_TYPE__=long int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__arm__=1",
6+
"-D__ARM_32BIT_STATE=1",
7+
"-D__PTRDIFF_TYPE__=int",
8+
"-D__SIZE_TYPE__=unsigned int",
9+
"-D__WCHAR_TYPE__=long int"
10+
],
11+
"defaults_op": "merge"
12+
}

‎Extension/bin/macos.clang.arm64.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__aarch64__=1",
7-
"-D__ARM_64BIT_STATE=1",
8-
"-D__PTRDIFF_TYPE__=long int",
9-
"-D__SIZE_TYPE__=long unsigned int",
10-
"-D__WCHAR_TYPE__=int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__aarch64__=1",
6+
"-D__ARM_64BIT_STATE=1",
7+
"-D__PTRDIFF_TYPE__=long int",
8+
"-D__SIZE_TYPE__=long unsigned int",
9+
"-D__WCHAR_TYPE__=int"
10+
],
11+
"defaults_op": "merge"
12+
}

‎Extension/bin/macos.clang.x64.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__x86_64=1",
7-
"-D__x86_64__=1",
8-
"-D__PTRDIFF_TYPE__=long int",
9-
"-D__SIZE_TYPE__=long unsigned int",
10-
"-D__WCHAR_TYPE__=int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__x86_64=1",
6+
"-D__x86_64__=1",
7+
"-D__PTRDIFF_TYPE__=long int",
8+
"-D__SIZE_TYPE__=long unsigned int",
9+
"-D__WCHAR_TYPE__=int"
10+
],
11+
"defaults_op": "merge"
12+
}

‎Extension/bin/macos.clang.x86.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0",
4-
"-D__APPLE__=1",
5-
"-D__MACH__=1",
6-
"-D__i386=1",
7-
"-D__i386__=1",
8-
"-D__PTRDIFF_TYPE__=int",
9-
"-D__SIZE_TYPE__=unsigned int",
10-
"-D__WCHAR_TYPE__=long int"
11-
],
12-
"defaults_op": "merge"
13-
}
1+
{
2+
"defaults": [
3+
"-D__APPLE__=1",
4+
"-D__MACH__=1",
5+
"-D__i386=1",
6+
"-D__i386__=1",
7+
"-D__PTRDIFF_TYPE__=int",
8+
"-D__SIZE_TYPE__=unsigned int",
9+
"-D__WCHAR_TYPE__=long int"
10+
],
11+
"defaults_op": "merge"
12+
}

‎Extension/bin/windows.clang.arm.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
{
2-
"defaults": [
3-
"-D__building_module(x)=0"
4-
],
5-
"defaults_op": "merge"
6-
}
1+
{
2+
"defaults": [
3+
],
4+
"defaults_op": "merge"
5+
}

0 commit comments

Comments
 (0)