Merge branch 'main' into insiders

.github/actions/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/github": "^2.1.1",
-    "axios": "^0.19.2"
+    "axios": "^0.21.1"
   },
   "devDependencies": {
     "eslint": "^6.8.0",

Extension/CHANGELOG.md

@@ -11,7 +11,7 @@
 * Fix #include completion not sorting _ last. [#3465](https://github.com/microsoft/vscode-cpptools/issues/3465)
 * Fix crash when certain JavaScript files are parsed as C++. [#3858](https://github.com/microsoft/vscode-cpptools/issues/3858)
 * Fix IntelliSense squiggle about not being able to assign to an object of its own type. [#3883](https://github.com/microsoft/vscode-cpptools/issues/3883)
-* Fix hover and Find All References for template function overloads. [#4044[(https://github.com/microsoft/vscode-cpptools/issues/4044), [#4249](https://github.com/microsoft/vscode-cpptools/issues/4249)
+* Fix hover and Find All References for template function overloads. [#4044](https://github.com/microsoft/vscode-cpptools/issues/4044), [#4249](https://github.com/microsoft/vscode-cpptools/issues/4249)
 * Fix the Outline view for nested namespaces. [#4456](https://github.com/microsoft/vscode-cpptools/issues/4456)
 * Fix Outline view with`"**/.*"` in `files.exclude`. [#4602](https://github.com/microsoft/vscode-cpptools/issues/4602)
 * Fix the Outline view for nested structs/classes. [#4781](https://github.com/microsoft/vscode-cpptools/issues/4871)

Extension/bin/common.json

@@ -0,0 +1,33 @@
+{
+  "defaults": [
+    "cpfe",
+    "--wchar_t_keyword",
+    "--no_warnings",
+    "--rtti",
+    "--edge",
+    "--exceptions",
+    "--error_limit",
+    "25000",
+    "-D_EDG_COMPILER",
+    "-D_USE_DECLSPECS_FOR_SAL=1"
+  ],
+  "source_file_format": "-f %s",
+  "expressions": [
+    {
+      "match": "^/I(.*)",
+      "replace": "-I\n$1"
+    },
+    {
+      "match": "^/D(.*)",
+      "replace": "-D$1"
+    },
+    {
+      "match": "^/AI(.*)",
+      "replace": "--using_directory\n$1"
+    },
+    {
+      "match": "^/dE--header_only_fallback",
+      "replace": "--header_only_fallback"
+    }
+  ]
+}

Extension/bin/linux.clang.arm.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.clang.arm64.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.clang.x64.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.clang.x86.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.gcc.arm.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.gcc.arm64.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.gcc.x64.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/linux.gcc.x86.json

@@ -0,0 +1,15 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.clang.arm.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.clang.arm64.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.clang.x64.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.clang.x86.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.gcc.arm.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.gcc.arm64.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.gcc.x64.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}

Extension/bin/macos.gcc.x86.json

@@ -0,0 +1,14 @@
+{
+  "defaults": [
+    "--pack_alignment",
+    "8",
+    "-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"
+}