Merge branch 'main' into seanmcm/1_4_0_insiders3

Build/loc/TranslationsImportExport.yml

@@ -41,6 +41,7 @@ steps:
     patVariable: '$(OneLocBuildPat)'
     LclSource: lclFilesfromPackage
     LclPackageId: 'LCL-JUNO-PROD-VCPP'
+    lsBuildXLocPackageVersion: '7.0.30510'
 
 - task: CmdLine@2
   inputs:

Extension/CHANGELOG.md

@@ -1,13 +1,27 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 1.4.0-insiders3: May 24, 2021
+### Enhancements
+* Add `private` or `protected` scope labels to class symbols. [#7120](https://github.com/microsoft/vscode-cpptools/issues/7120)
+* Improvements to the C++ "Getting Started" walkthrough. [PR #7554](https://github.com/microsoft/vscode-cpptools/pull/7554)
+
+### Bug Fixes
+* Fix bitness detection for compilers targeting esp32. [#7034](https://github.com/microsoft/vscode-cpptools/issues/7034)
+* Fix issue with cpptools process lingering when no longer needed.  [#7262](https://github.com/microsoft/vscode-cpptools/issues/7262)
+* Fix enabling of the `ms_extensions` flag for clang on Windows. [#7529](https://github.com/microsoft/vscode-cpptools/issues/7529)
+* Fix `autocompleteAddParentheses` with no argument const/non-const overloads and deduction guides. [#7540](https://github.com/microsoft/vscode-cpptools/issues/7540), [#7541](https://github.com/microsoft/vscode-cpptools/issues/7541)
+* Fix clang-format failure on macOS 10.13 or older. [#7561](https://github.com/microsoft/vscode-cpptools/issues/7561)
+* Prevent 'Configuration Warnings' output when a custom configuration provider omits optional fields.
+* Prevent 'Configuration Warnings' caused by corrections to auto-detected default configuration values.
+
 ## Version 1.4.0-insiders2: May 17, 2021
 ### New Features
 * Add a C++ walkthrough to the "Getting Started" page. [#7273](https://github.com/microsoft/vscode-cpptools/issues/7273)
   * Currently, it's only usable when `"workbench.welcomePage.experimental.extensionContributions": true` is set with VS Code Insiders.
 
 ### Bug Fixes
 * Fix an incorrect IntelliSense error with object initialization. [#3212](https://github.com/microsoft/vscode-cpptools/issues/3212)
-* Fix macros getting undefined when duplicate `#include` are used. [#5182](https://github.com/microsoft/vscode-cpptools/issues/5182], [#7270](https://github.com/microsoft/vscode-cpptools/issues/7270)
+* Fix macros getting undefined when duplicate `#include` are used. [#5182](https://github.com/microsoft/vscode-cpptools/issues/5182), [#7270](https://github.com/microsoft/vscode-cpptools/issues/7270)
 * Fix IntelliSense crash with `#pragma GCC target`. [#6698](https://github.com/microsoft/vscode-cpptools/issues/6698), [#7377](https://github.com/microsoft/vscode-cpptools/issues/7377)
 * Fix completion at the end of a file. [#7472](https://github.com/microsoft/vscode-cpptools/issues/7472)
 * Fix completion of constructors. [#7505](https://github.com/microsoft/vscode-cpptools/issues/7505)

Extension/i18n/chs/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "是",
 	"no.button": "否",
 	"configurations.received": "已收到自定义配置:",
-	"browse.configuration.received": "已收到自定义浏览配置: {0}"
+	"browse.configuration.received": "已收到自定义浏览配置: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/cht/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "是",
 	"no.button": "否",
 	"configurations.received": "收到的自訂組態:",
-	"browse.configuration.received": "收到的自訂瀏覽組態: {0}"
+	"browse.configuration.received": "收到的自訂瀏覽組態: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/csy/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Ano",
 	"no.button": "Ne",
 	"configurations.received": "Přijaly se vlastní konfigurace:",
-	"browse.configuration.received": "Přijala se vlastní konfigurace procházení: {0}"
+	"browse.configuration.received": "Přijala se vlastní konfigurace procházení: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/deu/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Ja",
 	"no.button": "Nein",
 	"configurations.received": "Benutzerdefinierte Konfigurationen empfangen:",
-	"browse.configuration.received": "Benutzerdefinierte Suchkonfiguration empfangen: {0}"
+	"browse.configuration.received": "Benutzerdefinierte Suchkonfiguration empfangen: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/esn/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Sí",
 	"no.button": "No",
 	"configurations.received": "Configuraciones personalizadas recibidas:",
-	"browse.configuration.received": "Configuración de exploración personalizada recibida: {0}"
+	"browse.configuration.received": "Configuración de exploración personalizada recibida: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/fra/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Oui",
 	"no.button": "Non",
 	"configurations.received": "Configurations personnalisées reçues :",
-	"browse.configuration.received": "Configuration de navigation personnalisée reçue : {0}"
+	"browse.configuration.received": "Configuration de navigation personnalisée reçue : {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/ita/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Sì",
 	"no.button": "No",
 	"configurations.received": "Configurazioni personalizzate ricevute:",
-	"browse.configuration.received": "La configurazione di esplorazione personalizzata è stata ricevuta: {0}"
+	"browse.configuration.received": "La configurazione di esplorazione personalizzata è stata ricevuta: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/jpn/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "はい",
 	"no.button": "いいえ",
 	"configurations.received": "カスタム構成を受信しました:",
-	"browse.configuration.received": "カスタムの参照構成を受信しました: {0}"
+	"browse.configuration.received": "カスタムの参照構成を受信しました: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/kor/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "예",
 	"no.button": "아니요",
 	"configurations.received": "사용자 지정 구성이 수신됨:",
-	"browse.configuration.received": "사용자 지정 찾아보기 구성이 수신됨: {0}"
+	"browse.configuration.received": "사용자 지정 찾아보기 구성이 수신됨: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/plk/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Tak",
 	"no.button": "Nie",
 	"configurations.received": "Odebrano konfiguracje niestandardowe:",
-	"browse.configuration.received": "Odebrano niestandardową konfigurację przeglądania: {0}"
+	"browse.configuration.received": "Odebrano niestandardową konfigurację przeglądania: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/ptb/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Sim",
 	"no.button": "Não",
 	"configurations.received": "Configurações personalizadas recebidas:",
-	"browse.configuration.received": "Configuração de pesquisa personalizada recebida: {0}"
+	"browse.configuration.received": "Configuração de pesquisa personalizada recebida: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/rus/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Да",
 	"no.button": "Нет",
 	"configurations.received": "Получены пользовательские конфигурации:",
-	"browse.configuration.received": "Получена настраиваемая конфигурация просмотра: {0}"
+	"browse.configuration.received": "Получена настраиваемая конфигурация просмотра: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/i18n/trk/src/LanguageServer/client.i18n.json

@@ -33,5 +33,8 @@
 	"yes.button": "Evet",
 	"no.button": "Hayır",
 	"configurations.received": "Alınan özel yapılandırmalar:",
-	"browse.configuration.received": "Özel gözatma yapılandırması alındı: {0}"
+	"browse.configuration.received": "Özel gözatma yapılandırması alındı: {0}",
+	"no.compilers.found": "No C++ compilers were found on your system. For your platform, we recommend installing {0} using the instructions in the editor.",
+	"compilers.found": "We found the following C++ compiler(s) on your system:",
+	"compilers.found.message": "You can specify which compiler to use in your project's IntelliSense Configuration."
 }

Extension/package.json

@@ -112,40 +112,10 @@
               }
             }
           },
-          {
-            "id": "build.project.mac",
-            "title": "Build your C++ file",
-            "description": "Create a default build task for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-clang-mac#_build-helloworldcpp)",
-            "when": "isMac",
-            "media": {
-              "altText": "A markdown file with instructions for configuring the default build task on macOS with Clang.",
-              "path": "walkthrough/buildtask/build-project-mac.md"
-            }
-          },
-          {
-            "id": "build.project.linux",
-            "title": "Build your C++ file",
-            "description": "Create a default build task for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-linux#_build-helloworldcpp)",
-            "when": "isLinux",
-            "media": {
-              "altText": "A markdown file with instructions for configuring the default build task on Linux with GCC.",
-              "path": "walkthrough/buildtask/build-project-linux.md"
-            }
-          },
-          {
-            "id": "build.project.windows",
-            "title": "Build your C++ file",
-            "description": "Create a default build task for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-msvc#_build-helloworldcpp)",
-            "when": "isWindows",
-            "media": {
-              "altText": "A markdown file with instructions for configuring the default build task on Windows with MSVC.",
-              "path": "walkthrough/buildtask/build-project-windows.md"
-            }
-          },
           {
             "id": "run.project.mac",
             "title": "Run and debug your C++ file",
-            "description": "Create a debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
+            "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
             "when": "isMac",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on macOS.",
@@ -155,7 +125,7 @@
           {
             "id": "run.project.linux",
             "title": "Run and debug your C++ file",
-            "description": "Create a debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
+            "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
             "when": "isLinux",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on Linux.",
@@ -165,7 +135,7 @@
           {
             "id": "run.project.windows",
             "title": "Run and debug your C++ file",
-            "description": "Create a debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
+            "description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
             "when": "isWindows",
             "media": {
               "altText": "A markdown file with instructions for starting a debugging session on Windows.",
@@ -249,7 +219,7 @@
     "viewsWelcome": [
       {
         "view": "debug",
-        "contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
+        "contents": "%c_cpp.contributes.viewsWelcome.contents%",
         "when": "debugStartLanguage == cpp || debugStartLanguage == c || debugStartLanguage == cuda-cpp"
       }
     ],
@@ -2832,7 +2802,7 @@
       "binaries": [
         "./LLVM/bin/clang-format.darwin"
       ],
-      "integrity": "62A2ECB43511129F920D87BAE9230A803B54712038BCCB485F8F10B84B1A2000"
+      "integrity": "AEB24D394118EAD87087DCC651F2EE329FC335ECE88ED6C8C2A9E93ED60DFECD"
     },
     {
       "description": "ClangFormat (OS X arm64)",
@@ -2846,7 +2816,7 @@
       "binaries": [
         "./LLVM/bin/clang-format.darwin"
       ],
-      "integrity": "90AD3B05EC9C0A706C440B99AC39000F97EFE8BBAB9A000834E18F8112468147"
+      "integrity": "AE5507F54562B9DA99E3F8318E25C93BD38AD2FBF4238ADF1C152ECFB0C10FA9"
     },
     {
       "description": "ClangFormat (Windows x86)",

Extension/package.nls.json

@@ -171,6 +171,7 @@
     "c_cpp.configuration.filesExcludeWhen.description": "Additional check on the siblings of a matching file. Use $(basename) as variable for the matching file name.",
     "c_cpp.configuration.debugger.useBacktickCommandSubstitution.description": "If true, debugger shell command substitution will use obsolete backtick (`).",
     "c_cpp.contributes.views.cppReferencesView.title": "C/C++: Other references results",
+    "c_cpp.contributes.viewsWelcome.contents": "To learn more about launch.json, see [Configuring C/C++ debugging](https://code.visualstudio.com/docs/cpp/launch-json-reference).",
     "c_cpp.debuggers.pipeTransport.description": "When present, this tells the debugger to connect to a remote computer using another executable as a pipe that will relay standard input/output between VS Code and the MI-enabled debugger backend executable (such as gdb).",
     "c_cpp.debuggers.pipeTransport.default.pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'",
     "c_cpp.debuggers.pipeTransport.default.debuggerPath": "The full path to the debugger on the target machine, for example /usr/bin/gdb.",

Extension/src/LanguageServer/Providers/documentSymbolProvider.ts

@@ -3,7 +3,7 @@
  * See 'LICENSE' in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
-import { DefaultClient, LocalizeDocumentSymbol, GetDocumentSymbolRequestParams, GetDocumentSymbolRequest } from '../client';
+import { DefaultClient, LocalizeDocumentSymbol, GetDocumentSymbolRequestParams, GetDocumentSymbolRequest, SymbolScope } from '../client';
 import * as util from '../../common';
 import { processDelayedDidOpen } from '../extension';
 
@@ -16,7 +16,20 @@ export class DocumentSymbolProvider implements vscode.DocumentSymbolProvider {
         const documentSymbols: vscode.DocumentSymbol[] = [];
         if (symbols) {
             symbols.forEach((symbol) => {
-                const detail: string = util.getLocalizedString(symbol.detail);
+                let detail: string = util.getLocalizedString(symbol.detail);
+                if (symbol.scope === SymbolScope.Private) {
+                    if (detail.length === 0) {
+                        detail = "private";
+                    } else {
+                        detail = util.getLocalizedSymbolScope("private", detail);
+                    }
+                } else if (symbol.scope === SymbolScope.Protected) {
+                    if (detail.length === 0) {
+                        detail = "protected";
+                    } else {
+                        detail = util.getLocalizedSymbolScope("protected", detail);
+                    }
+                }
                 const r: vscode.Range = new vscode.Range(symbol.range.start.line, symbol.range.start.character, symbol.range.end.line, symbol.range.end.character);
                 const sr: vscode.Range = new vscode.Range(symbol.selectionRange.start.line, symbol.selectionRange.start.character, symbol.selectionRange.end.line, symbol.selectionRange.end.character);
                 const vscodeSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(symbol.name, detail, symbol.kind, r, sr);