get back files used for copilot context generation.

Author: spebl

Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts

@@ -5,7 +5,7 @@
 import * as vscode from 'vscode';
 import { Position, ResponseError } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
-import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest } from '../client';
+import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest, GetCopilotHoverInfoResult } from '../client';
 import { RequestCancelled, ServerCancelled } from '../protocolFilter';
 import { CppSettings } from '../settings';
 
@@ -92,8 +92,8 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
         return this.currentCancellationToken;
     }
 
-    public async getRequestInfo(document: vscode.TextDocument, position: vscode.Position): Promise<string> {
-        let requestInfo = "";
+    public async getRequestInfo(document: vscode.TextDocument, position: vscode.Position): Promise<GetCopilotHoverInfoResult> {
+        let response: GetCopilotHoverInfoResult;
         const params: GetCopilotHoverInfoParams = {
             textDocument: { uri: document.uri.toString() },
             position: Position.create(position.line, position.character)
@@ -105,26 +105,15 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
         }
 
         try {
-            const response = await this.client.languageClient.sendRequest(GetCopilotHoverInfoRequest, params, this.currentCancellationToken);
-            requestInfo = response.content;
-            if (response.files) {
-                for (const file of response.files) {
-                    const fileUri = vscode.Uri.parse(file);
-                    const token = this.currentCancellationToken ?? new vscode.CancellationTokenSource().token;
-                    if (await vscode.lm.fileIsIgnored(fileUri, token)) {
-                        return "";
-                    }
-                }
-            }
-
+            response = await this.client.languageClient.sendRequest(GetCopilotHoverInfoRequest, params, this.currentCancellationToken);
         } catch (e: any) {
             if (e instanceof ResponseError && (e.code === RequestCancelled || e.code === ServerCancelled)) {
                 throw new vscode.CancellationError();
             }
             throw e;
         }
 
-        return requestInfo;
+        return response;
     }
 
     public isCancelled(document: vscode.TextDocument, position: vscode.Position): boolean {

Extension/src/LanguageServer/client.ts

@@ -539,7 +539,7 @@ export interface GetCopilotHoverInfoParams {
     position: Position;
 }
 
-interface GetCopilotHoverInfoResult {
+export interface GetCopilotHoverInfoResult {
     content: string;
     files: string[];
 }

Extension/src/LanguageServer/extension.ts

@@ -11,7 +11,7 @@ import * as StreamZip from 'node-stream-zip';
 import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { Range } from 'vscode-languageclient';
+import { CancellationToken, Range } from 'vscode-languageclient';
 import * as nls from 'vscode-nls';
 import { TargetPopulation } from 'vscode-tas-client';
 import * as which from 'which';
@@ -1430,7 +1430,17 @@ async function onCopilotHover(): Promise<void> {
 
     // Gather the content for the query from the client.
     const requestInfo = await copilotHoverProvider.getRequestInfo(hoverDocument, hoverPosition);
-    if (requestInfo.length === 0) {
+    for (const file of requestInfo.files) {
+        // TODO: make uri from file string.
+        const fileUri = vscode.Uri.file(file);
+        if (await vscodelm.fileIsIgnored(fileUri, copilotHoverProvider.getCurrentHoverCancellationToken() ?? CancellationToken.None)) {
+            // Context is not available for this file.
+            telemetry.logLanguageServerEvent("CopilotHover", { "Message": "Copilot summary is not available for this file." });
+            await showCopilotContent(copilotHoverProvider, hoverDocument, hoverPosition, localize("copilot.hover.unavailable", "Copilot summary is not available for this file."));
+            return;
+        }
+    }
+    if (requestInfo.content.length === 0) {
         // Context is not available for this symbol.
         telemetry.logLanguageServerEvent("CopilotHover", { "Message": "Copilot summary is not available for this symbol." });
         await showCopilotContent(copilotHoverProvider, hoverDocument, hoverPosition, localize("copilot.hover.unavailable", "Copilot summary is not available for this symbol."));