Add check for copilot access before providing copilot hover (#13238)

* Add check for copilot access before providing copilot hover * Don't check flight until we can validate copilot is enabled
microsoft · Feb 5, 2025 · e5e176b · e5e176b
1 parent 64c00a9
commit e5e176b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts b/Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts
@@ -5,6 +5,8 @@
 import * as vscode from 'vscode';
 import { Position, ResponseError } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
+import { modelSelector } from '../../constants';
+import * as telemetry from '../../telemetry';
 import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest, GetCopilotHoverInfoResult } from '../client';
 import { RequestCancelled, ServerCancelled } from '../protocolFilter';
 import { CppSettings } from '../settings';
@@ -35,6 +37,22 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
             return undefined;
         }
 
+        // Ensure the user has access to Copilot.
+        const vscodelm = (vscode as any).lm;
+        if (vscodelm) {
+            const [model] = await vscodelm.selectChatModels(modelSelector);
+            if (!model) {
+                return undefined;
+            }
+        }
+
+        if (settings.copilotHover === "default") {
+            // Check flight to make sure the feature is enabled.
+            if (!await telemetry.isFlightEnabled("CppCopilotHover")) {
+                return undefined;
+            }
+        }
+
         const newHover = this.isNewHover(document, position);
         if (newHover) {
             this.reset();

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1316,8 +1316,7 @@ export class DefaultClient implements Client {
 
                 const settings: CppSettings = new CppSettings();
                 this.currentCopilotHoverEnabled = new PersistentWorkspaceState<string>("cpp.copilotHover", settings.copilotHover);
-                if (settings.copilotHover === "enabled" ||
-                    (settings.copilotHover === "default" && await telemetry.isFlightEnabled("CppCopilotHover"))) {
+                if (settings.copilotHover !== "disabled") {
                     this.copilotHoverProvider = new CopilotHoverProvider(this);
                     this.disposables.push(vscode.languages.registerHoverProvider(util.documentSelector, this.copilotHoverProvider));
                 }

diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts
@@ -1469,10 +1469,10 @@ async function onCopilotHover(): Promise<void> {
         vscode.LanguageModelChatMessage
             .User(requestInfo.content + locale)];
 
-    const [model] = await vscodelm.selectChatModels(modelSelector);
-
     let chatResponse: vscode.LanguageModelChatResponse | undefined;
     try {
+        const [model] = await vscodelm.selectChatModels(modelSelector);
+
         chatResponse = await model.sendRequest(
             messages,
             {},