Fix

Author: genlu

src/lsptoolshost/copilot/contextProviders.ts

@@ -7,7 +7,13 @@ import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageserver-protocol';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
 import { CSharpExtensionId } from '../../constants/csharpExtensionId';
-import { getCSharpDevKit } from '../../utils/getCSharpDevKit';
+import { csharpDevkitExtensionId, getCSharpDevKit } from '../../utils/getCSharpDevKit';
+import path from 'path';
+import { readJsonSync } from 'fs-extra';
+
+export const copilotLanguageServerExtensionComponentName = '@microsoft/visualstudio.copilot.roslyn.languageserver';
+export const copilotLanguageServerExtensionAssemblyName = 'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll';
+const copilotLanguageServerExtensionCapabilitiesFileName = 'capabilities.json';
 
 export interface DocumentContext {
     textDocument: lsp.TextDocumentIdentifier;
@@ -63,30 +69,54 @@ export function registerCopilotContextProviders(
     languageServer: RoslynLanguageServer,
     channel: vscode.LogOutputChannel
 ) {
-    const copilotApi = vscode.extensions.getExtension<CopilotApi>('github.copilot');
-    if (!copilotApi) {
-        channel.debug(
-            'Failed to find comnpatible version of GitHub Copilot extension installed. Skip registeration of Copilot context provider.'
-        );
+    const devkit = getCSharpDevKit();
+    if (!devkit) {
         return;
     }
 
-    copilotApi.activate().then(async (api) => {
+    devkit.activate().then(async (devKitExports) => {
         try {
-            const contextProviderApi = await api.getContextProviderAPI('v1');
+            // Check if the Copilot Language Server extension is installed and has the correct capabilities
+            let hasCapabilities = false;
+            const copilotServerExtensionfolder = devKitExports.components[copilotLanguageServerExtensionComponentName];
+            if (copilotServerExtensionfolder) {
+                const capabilitiesFilePath = path.join(
+                    copilotServerExtensionfolder,
+                    copilotLanguageServerExtensionCapabilitiesFileName
+                );
+                const capabilitiesContent = await readJsonSync(capabilitiesFilePath);
+                if (
+                    capabilitiesContent?.capabilities?.find(
+                        (capability: any) =>
+                            capability?.method === resolveContextMethodName &&
+                            capability?.version === resolveContextMethodSupportedVersion
+                    )
+                ) {
+                    hasCapabilities = true;
+                }
+            }
 
-            if (!contextProviderApi) {
+            if (!hasCapabilities) {
                 channel.debug(
-                    'Incompatible GitHub Copilot extension installed. Skip registeration of C# context providers.'
+                    `Failed to find compatible version of context provider from installed version of ${csharpDevkitExtensionId}.`
                 );
                 return;
             }
 
-            const devkitExports = await getCSharpDevKit()?.activate();
-            const contextResolveVersion = devkitExports?.copilotCapabilities?.get(resolveContextMethodName);
-            if (contextResolveVersion === undefined || contextResolveVersion !== resolveContextMethodSupportedVersion) {
+            const copilotApi = vscode.extensions.getExtension<CopilotApi>('github.copilot');
+            if (!copilotApi) {
                 channel.debug(
-                    'Unsupported resolveContext method version. Skip registration of Copilot context provider.'
+                    'Failed to find compatible version of GitHub Copilot extension installed. Skip registeration of Copilot context provider.'
+                );
+                return;
+            }
+
+            const api = await copilotApi.activate();
+            const contextProviderApi = await api.getContextProviderAPI('v1');
+
+            if (!contextProviderApi) {
+                channel.debug(
+                    'Incompatible GitHub Copilot extension installed. Skip registeration of C# context providers.'
                 );
                 return;
             }
@@ -101,12 +131,13 @@ export function registerCopilotContextProviders(
                             if (!contextResolveParam) {
                                 return [];
                             }
-                            const traits = await languageServer.sendRequest(
+                            const items = await languageServer.sendRequest(
                                 resolveContextRequest,
                                 contextResolveParam,
                                 token
                             );
-                            return traits;
+                            channel.trace(`Copilot context provider resolved ${items.length} items`);
+                            return items;
                         },
                     },
                 })

src/lsptoolshost/copilot/relatedFilesProvider.ts

@@ -92,6 +92,7 @@ export function registerCopilotRelatedFilesProvider(
                             channel.appendLine(e.message);
                         }
                     }
+                    channel.trace(`Copilot related files provider returned ${relatedFiles.length} items`);
                     return { entries: relatedFiles };
                 })
             );

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -67,6 +67,10 @@ import { getProfilingEnvVars } from '../profiling/profiling';
 import { isString } from '../utils/isString';
 import { getServerPath } from '../activate';
 import { UriConverter } from '../utils/uriConverter';
+import {
+    copilotLanguageServerExtensionAssemblyName,
+    copilotLanguageServerExtensionComponentName,
+} from '../copilot/contextProviders';
 
 // Flag indicating if C# Devkit was installed the last time we activated.
 // Used to determine if we need to restart the server on extension changes.
@@ -1028,16 +1032,15 @@ export class RoslynLanguageServer {
             await exports.setupTelemetryEnvironmentAsync(env);
         }
 
-        const copilotServerExtensionfolder =
-            exports.components['@microsoft/visualstudio.copilot.roslyn.languageserver'];
+        const copilotServerExtensionfolder = exports.components[copilotLanguageServerExtensionComponentName];
         if (copilotServerExtensionfolder) {
             const copilotServerExtensionFullPath = path.join(
                 copilotServerExtensionfolder,
-                'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll'
+                copilotLanguageServerExtensionAssemblyName
             );
             additionalExtensionPaths.push(copilotServerExtensionFullPath);
             channel.trace(
-                `CSharp DevKit contributes csharpCopilotExtensionLoadPath: ${copilotServerExtensionFullPath}`
+                `CSharp DevKit contributes Copilot langauge server extension: ${copilotServerExtensionFullPath}`
             );
         }
     }