Merge branch 'main' into dev/allow_signed_metrics_values

sean-mcmanus · web-flow · commit 52029aae40c2 · 2025-03-03T13:43:16.000-08:00
diff --git a/Extension/src/LanguageServer/settingsTracker.ts b/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;

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ export class SettingsTracker {`
`104`	`104`	`}`
`105`	`105`	`const curEnum: any[] = curSetting["enum"];`
`106`	`106`	`if (curEnum && curEnum.indexOf(val) === -1`
`107`		`- && (key !== "loggingLevel" \|\| util.getNumericLoggingLevel(val) === -1)) {`
	`107`	`+ && (key !== "loggingLevel" \|\| util.getNumericLoggingLevel(val) === -1)`
	`108`	`+ && (key !== "copilotHover" \|\| val !== "enabled")) {`
`108`	`109`	`return "<invalid>";`
`109`	`110`	`}`
`110`	`111`	`return val;`