Merge branch 'main' into handle-multiple-compile-commands

Author: sean-mcmanus

Extension/package.nls.json

@@ -173,7 +173,7 @@
         ]
     },
     "c_cpp.configuration.codeAnalysis.clangTidy.path.markdownDescription": {
-        "message": "The full path of the `clang-tidy` executable. If not specified, and `clang-tidy` is available in the environment path, that is used. If not found in the environment path, the `clang-tidy` bundled with the extension will be used.",
+        "message": "The full path of the `clang-tidy` executable. If not specified, and `clang-tidy` is available in the environment path, that is used unless the version bundled with the extension is newer. If not found in the environment path, the `clang-tidy` bundled with the extension will be used.",
         "comment": [
             "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
         ]
@@ -446,7 +446,7 @@
         ]
     },
     "c_cpp.configuration.clang_format_path.markdownDescription": {
-        "message": "The full path of the `clang-format` executable. If not specified, and `clang-format` is available in the environment path, that is used. If not found in the environment path, the `clang-format` bundled with the extension will be used.",
+        "message": "The full path of the `clang-format` executable. If not specified, and `clang-format` is available in the environment path, that is used unless the version bundled with the extension is newer. If not found in the environment path, the `clang-format` bundled with the extension will be used.",
         "comment": [
             "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
         ]

Extension/src/LanguageServer/client.ts

@@ -1384,7 +1384,7 @@ export class DefaultClient implements Client {
         const filesEncoding: string = otherSettings.filesEncoding;
         let filesEncodingChanged: boolean = false;
         if (workspaceFolder) {
-            const lastFilesEncoding: PersistentFolderState<string> = new PersistentFolderState<string>("CPP.lastFilesEncoding", "", workspaceFolder);
+            const lastFilesEncoding: PersistentFolderState<string> = new PersistentFolderState<string>("CPP.lastFilesEncoding", filesEncoding, workspaceFolder);
             filesEncodingChanged = lastFilesEncoding.Value !== filesEncoding;
         }
         const result: WorkspaceFolderSettingsParams = {
@@ -1519,7 +1519,7 @@ export class DefaultClient implements Client {
             void util.promptForReloadWindowDueToSettingsChange();
         }
         const workspaceFallbackEncoding: string = workspaceOtherSettings.filesEncoding;
-        const lastWorkspaceFallbackEncoding: PersistentState<string> = new PersistentState<string>("CPP.lastWorkspaceFallbackEncoding", "");
+        const lastWorkspaceFallbackEncoding: PersistentState<string> = new PersistentState<string>("CPP.lastWorkspaceFallbackEncoding", workspaceFallbackEncoding);
         const workspaceFallbackEncodingChanged = lastWorkspaceFallbackEncoding.Value !== workspaceFallbackEncoding;
         return {
             filesAssociations: workspaceOtherSettings.filesAssociations,

Extension/src/LanguageServer/persistentState.ts

@@ -19,6 +19,11 @@ class PersistentStateBase<T> {
         this.defaultvalue = defaultValue;
         this.state = state;
         this.curvalue = defaultValue;
+
+        // Ensure the default is written to the state store.
+        if (this.state && this.state.get<T>(this.key) === undefined) {
+            void this.state.update(this.key, this.defaultvalue);
+        }
     }
 
     public get Value(): T {

Extension/src/main.ts

@@ -221,6 +221,7 @@ function sendTelemetry(info: PlatformInformation): void {
         default:
             break;
     }
+    telemetryProperties['appName'] = vscode.env.appName;
     Telemetry.logDebuggerEvent("acquisition", telemetryProperties);
     logMachineIdMappings().catch(logAndReturn.undefined);
 }