Minor updates to handle an error case and PR comments

Author: AbhitejJohn

package.json

@@ -423,10 +423,10 @@
       "integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
     },
     {
-      "id": "RoslynCopilotLanguageServer",
+      "id": "RoslynCopilot",
       "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",
+      "installPath": ".roslyncopilot",
       "platforms": [
         "win32",
         "linux",
@@ -437,7 +437,7 @@
         "x86_64",
         "arm64"
       ],
-      "installTestPath": "./.roslyncopilotlanguageserver/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll",
+      "installTestPath": "./.roslyncopilot/Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll",
       "integrity": "9944EBD6EE06BD595BCADD3057CD9BEF4105C3A3952DAE03E54F3114E2E6661F"
     },
     {

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 fs from 'fs';
 import * as util from '../../common';
 import {
     LanguageClientOptions,
@@ -106,11 +107,10 @@ export class RoslynLanguageServer {
     private static _processId: number | undefined;
 
     /**
-     * The folder name for the Roslyn Copilot language server extension.
+     * The folder name for the Roslyn Copilot language server dll.
      */
-    private static readonly _copilotLanguageServerExtensionDirName = '.roslyncopilotlanguageserver';
-    private static readonly _copilotLanguageServerExtensionAssemblyName =
-        'Microsoft.VisualStudio.Copilot.Roslyn.LanguageServer.dll';
+    private static readonly _copilotLanguageServerDllDirName = '.roslyncopilot';
+    private static readonly _copilotLanguageServerDllName = '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
@@ -1083,20 +1083,19 @@ export class RoslynLanguageServer {
             await exports.setupTelemetryEnvironmentAsync(env);
         }
 
-        const copilotServerExtensionfolder = path.join(
+        const copilotServerExtensionFullPath = path.join(
             util.getExtensionPath(),
-            RoslynLanguageServer._copilotLanguageServerExtensionDirName
+            RoslynLanguageServer._copilotLanguageServerDllDirName,
+            RoslynLanguageServer._copilotLanguageServerDllName
         );
 
-        if (copilotServerExtensionfolder) {
-            const copilotServerExtensionFullPath = path.join(
-                copilotServerExtensionfolder,
-                RoslynLanguageServer._copilotLanguageServerExtensionAssemblyName
-            );
+        if (fs.existsSync(copilotServerExtensionFullPath)) {
             additionalExtensionPaths.push(copilotServerExtensionFullPath);
             channel.trace(
-                `CSharp DevKit contributes Copilot langauge server extension: ${copilotServerExtensionFullPath}`
+                `CSharp DevKit contributes Copilot language server extension: ${copilotServerExtensionFullPath}`
             );
+        } else {
+            channel.debug(`Copilot language server extension not found at: ${copilotServerExtensionFullPath}`);
         }
     }
 

src/main.ts

@@ -78,7 +78,7 @@ export async function activate(
         requiredPackageIds.push('OmniSharp');
     }
     if (csharpDevkitExtension) {
-        requiredPackageIds.push('RoslynCopilotLanguageServer');
+        requiredPackageIds.push('RoslynCopilot');
     }
 
     const networkSettingsProvider = vscodeNetworkSettingsProvider(vscode);