Cleanup

Author: dibarbet

src/lsptoolshost/roslynLanguageClient.ts

@@ -3,11 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LanguageClient, LanguageClientOptions, ServerOptions, Trace } from "vscode-languageclient/node";
+import { LanguageClient, LanguageClientOptions, ServerOptions } from "vscode-languageclient/node";
 import CompositeDisposable from "../CompositeDisposable";
 import { IDisposable } from "../Disposable";
 
-export class RoslynLanguageClientInstance extends LanguageClient {
+/**
+ * Implementation of the base LangaugeClient type that allows for additional items to be disposed of
+ * when the base LanguageClient instance is disposed.
+ */
+export class RoslynLanguageClient extends LanguageClient {
 
     private readonly _disposables: CompositeDisposable;
 

src/lsptoolshost/roslynLanguageServer.ts

@@ -53,16 +53,14 @@ import { Options } from '../shared/options';
 import { ServerStateChange } from './ServerStateChange';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import CSharpIntelliCodeExports from '../CSharpIntelliCodeExports';
-import { csharpDevkitExtensionId, getCSharpDevKit } from '../utils/getCSharpDevKit';
+import { csharpDevkitExtensionId, csharpDevkitIntelliCodeExtensionId, getCSharpDevKit } from '../utils/getCSharpDevKit';
 import { randomUUID } from 'crypto';
-import { RoslynLanguageClientInstance } from './roslynLanguageClient';
+import { RoslynLanguageClient } from './roslynLanguageClient';
 
 let _languageServer: RoslynLanguageServer;
 let _channel: vscode.OutputChannel;
 let _traceChannel: vscode.OutputChannel;
 
-export const CSharpDevkitIntelliCodeExtensionId = "ms-dotnettools.vscodeintellicode-csharp";
-
 export class RoslynLanguageServer {
 
     // These are commands that are invoked by the Razor extension, and are used to send LSP requests to the Roslyn LSP server
@@ -89,7 +87,7 @@ export class RoslynLanguageServer {
      * The timeout for stopping the language server (in ms).
      */
     private static _stopTimeout: number = 10000;
-    private _languageClient: RoslynLanguageClientInstance | undefined;
+    private _languageClient: RoslynLanguageClient | undefined;
 
     /**
      * Flag indicating if C# Devkit was installed the last time we activated.
@@ -161,7 +159,7 @@ export class RoslynLanguageServer {
         };
 
         // Create the language client and start the client.
-        let client = new RoslynLanguageClientInstance(
+        let client = new RoslynLanguageClient(
             'microsoft-codeanalysis-languageserver',
             'Microsoft.CodeAnalysis.LanguageServer',
             serverOptions,
@@ -388,7 +386,7 @@ export class RoslynLanguageServer {
             this._wasActivatedWithCSharpDevkit = true;
 
             // Get the starred suggestion dll location from C# Dev Kit IntelliCode (if both C# Dev Kit and C# Dev Kit IntelliCode are installed).
-            const csharpDevkitIntelliCodeExtension = vscode.extensions.getExtension<CSharpIntelliCodeExports>(CSharpDevkitIntelliCodeExtensionId);
+            const csharpDevkitIntelliCodeExtension = vscode.extensions.getExtension<CSharpIntelliCodeExports>(csharpDevkitIntelliCodeExtensionId);
             if (csharpDevkitIntelliCodeExtension) {
                 _channel.appendLine("Activating C# + C# Dev Kit + C# IntelliCode...");
                 const csharpDevkitIntelliCodeArgs = await this.getCSharpDevkitIntelliCodeExportArgs(csharpDevkitIntelliCodeExtension);
@@ -432,7 +430,7 @@ export class RoslynLanguageServer {
         return childProcess;
     }
 
-    private registerRazor(client: RoslynLanguageClientInstance) {
+    private registerRazor(client: RoslynLanguageClient) {
         // When the Roslyn language server sends a request for Razor dynamic file info, we forward that request along to Razor via
         // a command.
         client.onRequest(
@@ -480,7 +478,7 @@ export class RoslynLanguageServer {
         }));
     }
 
-    private registerExtensionsChanged(languageClient: RoslynLanguageClientInstance) {
+    private registerExtensionsChanged(languageClient: RoslynLanguageClient) {
         // subscribe to extension change events so that we can get notified if C# Dev Kit is added/removed later.
         languageClient.addDisposable(vscode.extensions.onDidChange(async () => {
             let csharpDevkitExtension = getCSharpDevKit();
@@ -505,7 +503,7 @@ export class RoslynLanguageServer {
         }));
     }
 
-    private registerTelemtryChanged(languageClient: RoslynLanguageClientInstance) {
+    private registerTelemtryChanged(languageClient: RoslynLanguageClient) {
         // Subscribe to telemetry events so we can enable/disable as needed
         languageClient.addDisposable(vscode.env.onDidChangeTelemetryEnabled((isEnabled: boolean) => {
             const title = 'Restart Language Server';

src/utils/getCSharpDevKit.ts

@@ -7,6 +7,8 @@ import * as vscode from 'vscode';
 import { CSharpDevKitExports } from "../CSharpDevKitExports";
 
 export const csharpDevkitExtensionId = "ms-dotnettools.csdevkit";
+export const csharpDevkitIntelliCodeExtensionId = "ms-dotnettools.vscodeintellicode-csharp";
+
 
 export function getCSharpDevKit(): vscode.Extension<CSharpDevKitExports> | undefined {
     return vscode.extensions.getExtension<CSharpDevKitExports>(csharpDevkitExtensionId);