Updates to bring in the Copilot lanaguage server from a storage account instead of relying on its presence in C# Dev Kit.

Author: AbhitejJohn

package.json

@@ -422,6 +422,24 @@
       "isFramework": false,
       "integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
     },
+    {
+      "id": "RoslynCopilotLanguageServer",
+      "description": "Language server for Roslyn Copilot integration (Windows)",
+      "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.12/omnisharp-linux-musl-arm64-net6.0-1.39.12.zip",
+      "installPath": ".roslyncopilotlanguageserver",
+      "platforms": [
+        "win32",
+        "linux",
+        "linux-musl",
+        "darwin"
+      ],
+      "architectures": [
+        "x86_64",
+        "arm64"
+      ],
+      "installTestPath": "./.roslyncopilotlanguageserver/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll",
+      "integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
+    },
     {
       "id": "Debugger",
       "description": ".NET Core Debugger (Windows / x64)",

src/lsptoolshost/copilot/contextProviders.ts

@@ -7,13 +7,7 @@ import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageserver-protocol';
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
 import { CSharpExtensionId } from '../../constants/csharpExtensionId';
-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';
+import { getCSharpDevKit } from '../../utils/getCSharpDevKit';
 
 type ActiveExperiments = { [name: string]: string | number | boolean | string[] };
 
@@ -29,17 +23,9 @@ export interface ContextResolveParam {
     data?: any;
     activeExperiments: ActiveExperiments;
 }
-
-const oldResolveContextMethodName = 'roslyn/resolveContext';
-const oldresolveContextMethodSupportedVersion = '1';
-const newResolveContextMethodName = 'roslyn/resolveContext@2';
-const newResolveContextMethodSupportedVersion = '1';
-const oldResolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
-    oldResolveContextMethodName,
-    lsp.ParameterStructures.auto
-);
-const newResolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
-    newResolveContextMethodName,
+const resolveContextMethodName = 'roslyn/resolveContext@2';
+const resolveContextRequest = new lsp.RequestType<ContextResolveParam, SupportedContextItem[], void>(
+    resolveContextMethodName,
     lsp.ParameterStructures.auto
 );
 
@@ -85,43 +71,8 @@ export function registerCopilotContextProviders(
         return;
     }
 
-    devkit.activate().then(async (devKitExports) => {
+    devkit.activate().then(async () => {
         try {
-            let resolveMethod: lsp.RequestType<ContextResolveParam, SupportedContextItem[], void> | undefined =
-                undefined;
-            const copilotServerExtensionfolder = devKitExports.components[copilotLanguageServerExtensionComponentName];
-            if (copilotServerExtensionfolder) {
-                const capabilitiesFilePath = path.join(
-                    copilotServerExtensionfolder,
-                    copilotLanguageServerExtensionCapabilitiesFileName
-                );
-                const capabilitiesContent = await readJsonSync(capabilitiesFilePath);
-                for (const capability of capabilitiesContent?.capabilities ?? []) {
-                    if (
-                        capability.method === oldResolveContextMethodName &&
-                        capability.version === oldresolveContextMethodSupportedVersion
-                    ) {
-                        resolveMethod = oldResolveContextRequest;
-                        channel.debug(`supported 'roslyn/resolveContext' method found in capabilities.json`);
-                        break;
-                    } else if (
-                        capability.method === newResolveContextMethodName &&
-                        capability.version === newResolveContextMethodSupportedVersion
-                    ) {
-                        resolveMethod = newResolveContextRequest;
-                        channel.debug(`supported 'roslyn/resolveContext@2' method found in capabilities.json`);
-                        break;
-                    }
-                }
-            }
-
-            if (!resolveMethod) {
-                channel.debug(
-                    `Failed to find compatible version of context provider from installed version of ${csharpDevkitExtensionId}.`
-                );
-                return;
-            }
-
             const copilotApi = vscode.extensions.getExtension<CopilotApi>('github.copilot');
             if (!copilotApi) {
                 channel.debug(
@@ -150,7 +101,11 @@ export function registerCopilotContextProviders(
                             if (!contextResolveParam) {
                                 return [];
                             }
-                            const items = await languageServer.sendRequest(resolveMethod, contextResolveParam, token);
+                            const items = await languageServer.sendRequest(
+                                resolveContextRequest,
+                                contextResolveParam,
+                                token
+                            );
                             channel.trace(`Copilot context provider resolved ${items.length} items`);
                             return items;
                         },

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -8,6 +8,7 @@ import * as path from 'path';
 import * as cp from 'child_process';
 import * as uuid from 'uuid';
 import * as net from 'net';
+import * as util from '../../common';
 import {
     LanguageClientOptions,
     MessageTransports,
@@ -74,10 +75,6 @@ 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.
@@ -108,6 +105,13 @@ export class RoslynLanguageServer {
      */
     private static _processId: number | undefined;
 
+    /**
+     * The folder name for the Roslyn Copilot language server extension.
+     */
+    private static readonly _copilotLanguageServerExtensionDirName = '.roslyncopilotlanguageserver';
+    private static readonly _copilotLanguageServerExtensionAssemblyName =
+        'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll';
+
     /**
      * The solution file previously opened; we hold onto this so we can send this back over if the server were to be relaunched for any reason, like some other configuration
      * change that required the server to restart, or some other catastrophic failure that completely took down the process. In the case that the process is crashing because
@@ -1079,11 +1083,15 @@ export class RoslynLanguageServer {
             await exports.setupTelemetryEnvironmentAsync(env);
         }
 
-        const copilotServerExtensionfolder = exports.components[copilotLanguageServerExtensionComponentName];
+        const copilotServerExtensionfolder = path.join(
+            util.getExtensionPath(),
+            RoslynLanguageServer._copilotLanguageServerExtensionDirName
+        );
+
         if (copilotServerExtensionfolder) {
             const copilotServerExtensionFullPath = path.join(
                 copilotServerExtensionfolder,
-                copilotLanguageServerExtensionAssemblyName
+                RoslynLanguageServer._copilotLanguageServerExtensionAssemblyName
             );
             additionalExtensionPaths.push(copilotServerExtensionFullPath);
             channel.trace(

src/main.ts

@@ -77,6 +77,9 @@ export async function activate(
     if (useOmnisharpServer) {
         requiredPackageIds.push('OmniSharp');
     }
+    if (csharpDevkitExtension) {
+        requiredPackageIds.push('RoslynCopilotLanguageServer');
+    }
 
     const networkSettingsProvider = vscodeNetworkSettingsProvider(vscode);
     const useFramework = useOmnisharpServer && omnisharpOptions.useModernNet !== true;