Merge branch 'main' into bobbrow/typeChecking

Author: bobbrow

Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts

@@ -46,7 +46,7 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
             }
         }
 
-        if (settings.copilotHover === "default") {
+        if (new CppSettings().copilotHover === "default") {
             // Check flight to make sure the feature is enabled.
             if (!await telemetry.isFlightEnabled("CppCopilotHover")) {
                 return undefined;

Extension/src/LanguageServer/settingsTracker.ts

@@ -104,7 +104,8 @@ export class SettingsTracker {
                     }
                     const curEnum: any[] = curSetting["enum"];
                     if (curEnum && curEnum.indexOf(val) === -1
-                        && (key !== "loggingLevel" || util.getNumericLoggingLevel(val) === -1)) {
+                        && (key !== "loggingLevel" || util.getNumericLoggingLevel(val) === -1)
+                        && (key !== "copilotHover" || val !== "enabled")) {
                         return "<invalid>";
                     }
                     return val;