Fix automatic restart of language server upon changes in configuration

Author: wintersteiger

src/commands/registration.ts

@@ -1,9 +1,9 @@
 import * as implementations from './implementations';
 
 import { commands, ExtensionContext, languages, Uri, ViewColumn, window, workspace } from 'vscode';
-import { ImandraxLanguageClient } from '../imandrax_language_client/imandrax_language_client';
+import { ImandraXLanguageClient } from '../imandrax_language_client/imandrax_language_client';
 
-export function register(context: ExtensionContext, imandraxLanguageClient: ImandraxLanguageClient) {
+export function register(context: ExtensionContext, imandraxLanguageClient: ImandraXLanguageClient) {
   const getClient = () => { return imandraxLanguageClient.getClient(); };
 
   const restart_cmd = "imandrax.restart_language_server";

src/extension.ts

@@ -1,6 +1,7 @@
 import * as commands from './commands/commands';
 import * as decorations from './decorations';
 import * as formatter from './formatter';
+import * as ImandraXLanguageClientConfiguration from './imandrax_language_client/configuration';
 import * as imandraxLanguageClient from './imandrax_language_client/imandrax_language_client';
 import * as installer from './installer';
 import * as listeners from './listeners';
@@ -11,8 +12,7 @@ import {
   ExtensionMode,
   Uri,
   window,
-  workspace,
-  TextEditorDecorationType
+  workspace
 } from "vscode";
 
 import {
@@ -21,10 +21,10 @@ import {
 
 
 export async function activate(context: ExtensionContext) {
-  const languageClientConfig = imandraxLanguageClient.configuration.get();
+  const languageClientConfig = ImandraXLanguageClientConfiguration.get();
 
-  if (imandraxLanguageClient.configuration.isFoundPath(languageClientConfig)) {
-    const languageClientWrapper_ = new imandraxLanguageClient.ImandraxLanguageClient(languageClientConfig);
+  if (ImandraXLanguageClientConfiguration.isFoundPath(languageClientConfig)) {
+    const languageClientWrapper_ = new imandraxLanguageClient.ImandraXLanguageClient();
     const getClient: () => LanguageClient = () => { return languageClientWrapper_.getClient(); };
 
     formatter.register();
@@ -39,8 +39,8 @@ export async function activate(context: ExtensionContext) {
       (global as any).testListeners = listenersInstance;
     }
 
-    workspace.onDidChangeConfiguration(event => {
-      languageClientWrapper_.update_configuration(context.extensionUri, event);
+    workspace.onDidChangeConfiguration(async event => {
+      await languageClientWrapper_.update_configuration(context.extensionUri, event);
     });
 
     await languageClientWrapper_.start({ extensionUri: context.extensionUri });

src/imandrax_language_client/configuration.ts

@@ -24,8 +24,8 @@ type BinPathAvailability =
   }
 
 export interface ImandraXLanguageClientConfiguration {
-  serverArgs: any,
-  mergedEnv: any,
+  serverArgs: string[],
+  mergedEnv: object,
   binPathAvailability: BinPathAvailability,
 }
 

src/imandrax_language_client/imandrax_language_client.ts

@@ -1,24 +1,19 @@
 import * as commands from '../commands/commands';
 import * as decorations from '../decorations';
 import * as vfsProvider from '../vfs_provider';
-
-import { FoundPathConfig } from './configuration';
+import * as configuration from './configuration';
 
 import { ConfigurationChangeEvent, ExtensionContext, ExtensionMode, Uri, window, workspace, WorkspaceConfiguration } from 'vscode';
 import { Executable, LanguageClient, LanguageClientOptions } from 'vscode-languageclient/node';
 
 
-export * as configuration from './configuration';
-
-
 const MAX_RESTARTS = 10;
 
 export interface RestartParams {
   extensionUri: Uri
 }
 
-export class ImandraxLanguageClient {
-  private readonly serverOptions: Executable;
+export class ImandraXLanguageClient {
   private client!: LanguageClient;
   private readonly vfsProvider_: vfsProvider.VFSContentProvider;
   private restartCount = 0;
@@ -38,22 +33,30 @@ export class ImandraxLanguageClient {
     return this.vfsProvider_;
   }
 
-  constructor(languageClientConfig: FoundPathConfig) {
-    this.serverOptions = {
-      command: languageClientConfig.binPathAvailability.path,
-      args: languageClientConfig.serverArgs,
-      options: { env: languageClientConfig.mergedEnv }
-    };
+  constructor() {
     this.vfsProvider_ = new vfsProvider.VFSContentProvider(() => { return this.getClient(); });
   }
 
   // Start language server
   async start(params: { extensionUri: Uri }): Promise<void> {
+    const config = configuration.get();
+
+    if (!configuration.isFoundPath(config)) {
+      console.log("ImandraX binary not found, cannot start language server.");
+      return;
+    }
+
     const was_initial = this.isInitial();
     if (was_initial) {
       console.log("Starting ImandraX LSP server");
     }
 
+    const serverOptions : Executable = {
+      command: config.binPathAvailability.path,
+      args: config.serverArgs,
+      options: { env: config.mergedEnv }
+    };
+
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
       // Register the server for plain text documents
@@ -71,7 +74,7 @@ export class ImandraxLanguageClient {
     this.client = new LanguageClient(
       "imandrax_lsp",
       "ImandraX LSP",
-      this.serverOptions,
+      serverOptions,
       clientOptions
     );
 
@@ -86,7 +89,7 @@ export class ImandraxLanguageClient {
         (params) => { commands.visualize_decomp(extensionUri, params); });
       this.client.onNotification("$imandrax/vfs-file-changed",
         (params) => {
-          const uri = Uri.parse(params["uri"]);
+          const uri = Uri.parse(params.uri);
           this.vfsProvider_.onDidChangeEmitter.fire(uri);
         });
     }
@@ -131,9 +134,9 @@ export class ImandraxLanguageClient {
     if (event === undefined || event.affectsConfiguration('imandrax')) {
       const client = this.client;
       if (event && (
-        event.affectsConfiguration('imandrax.lsp.binary') ||
-        event.affectsConfiguration('imandrax.lsp.arguments') ||
-        event.affectsConfiguration('imandrax.lsp.environment'))) {
+        event.affectsConfiguration("imandrax.lsp.binary") ||
+        event.affectsConfiguration("imandrax.lsp.arguments") ||
+        event.affectsConfiguration("imandrax.lsp.environment"))) {
         await this.restart({ extensionUri: extensionUri });
       }
 

src/listeners.ts

@@ -1,6 +1,6 @@
 import * as decorations from './decorations';
 
-import { commands, DecorationOptions, DiagnosticSeverity, ExtensionContext, languages, StatusBarAlignment, StatusBarItem, TextEditor, ThemeColor, Uri, window } from 'vscode';
+import { commands, DecorationOptions, DiagnosticSeverity, ExtensionContext, languages, StatusBarAlignment, StatusBarItem, TextEditor, ThemeColor, Uri, window, DiagnosticChangeEvent } from 'vscode';
 import { LanguageClient } from 'vscode-languageclient/node';
 
 
@@ -39,21 +39,20 @@ export class Listeners {
   }
 
   diagnostics_for_editor(editor: TextEditor) {
-    let all_good: DecorationOptions[] = [];
-    const all_bad: DecorationOptions[] = [];
-    const doc = editor.document;
-    if (doc !== undefined) {
-      languages.getDiagnostics(doc.uri).forEach(d => {
+    if (editor) {
+      const uri = editor.document.uri;
+      let all_good: DecorationOptions[] = [];
+      const all_bad: DecorationOptions[] = [];
+      const diags = languages.getDiagnostics(uri);
+      diags.forEach(d => {
         if (d.source === "lsp") {
-          if (editor) {
-            const good = d.severity === DiagnosticSeverity.Information || d.severity === DiagnosticSeverity.Hint;
-            const range = d.range.with(d.range.start, d.range.start);
-            const decoration_options: DecorationOptions = { range: range };
-            if (good) {
-              all_good.push(decoration_options);
-            } else {
-              all_bad.push(decoration_options);
-            }
+          const good = d.severity === DiagnosticSeverity.Information || d.severity === DiagnosticSeverity.Hint;
+          const range = d.range.with(d.range.start, d.range.start);
+          const decoration_options: DecorationOptions = { range: range };
+          if (good) {
+            all_good.push(decoration_options);
+          } else {
+            all_bad.push(decoration_options);
           }
         }
       }
@@ -99,51 +98,47 @@ export class Listeners {
     }
   }
 
-  async diagnostic_listener() {
-    const editor = window.activeTextEditor;
-    if (editor !== undefined) {
-      const doc = editor.document;
-      if (doc !== undefined) {
-        if (doc.languageId === "imandrax") {
+  async diagnostic_listener(e: DiagnosticChangeEvent) {
+    await Promise.all(e.uris.map(async uri => {
+      const editor = window.visibleTextEditors.find(e => e.document.uri.path == uri.path)
+      if (editor) {
+        const doc = editor.document;
+        if (doc && doc.languageId === "imandrax") {
           this.diagnostics_for_editor(editor);
-          const file_uri = editor.document.uri;
-          if (file_uri.scheme === "file") {
-            await this.req_file_progress(file_uri);
+          if (doc.uri.scheme === "file") {
+            await this.req_file_progress(doc.uri);
           } else {
             this.file_progress_sbi.hide();
           }
         }
       }
     }
+    ));
   }
 
-  async active_editor_listener() {
-    const editor = window.activeTextEditor;
-    if (editor !== undefined) {
+  async active_editor_listener(editor: TextEditor | undefined) {
+    if (editor) {
       const doc = editor.document;
-      if (doc !== undefined) {
-        if (doc.languageId === "imandrax") {
-          this.diagnostics_for_editor(editor);
-          const file_uri = doc.uri;
-          if (file_uri.scheme === "file") {
-            if (this.getClient()?.isRunning()) {
-              await this.getClient().sendNotification("$imandrax/active-document", { "uri": file_uri.path });
-            }
-            await this.req_file_progress(file_uri);
-          }
-          else {
-            this.file_progress_sbi.hide();
+      if (doc && doc.languageId === "imandrax") {
+        this.diagnostics_for_editor(editor);
+        if (doc.uri.scheme === "file") {
+          if (this.getClient()?.isRunning()) {
+            await this.getClient().sendNotification("$imandrax/active-document", { "uri": doc.uri.path });
           }
+          await this.req_file_progress(doc.uri);
         }
         else {
           this.file_progress_sbi.hide();
         }
       }
+      else {
+        this.file_progress_sbi.hide();
+      }
     }
   }
 
   public register() {
-    languages.onDidChangeDiagnostics(async () => { await this.diagnostic_listener(); }, undefined, []);
-    window.onDidChangeActiveTextEditor(async () => { await this.active_editor_listener(); }, undefined, []);
+    languages.onDidChangeDiagnostics(async (e: DiagnosticChangeEvent) => { await this.diagnostic_listener(e); });
+    window.onDidChangeActiveTextEditor(async (e: TextEditor | undefined) => { await this.active_editor_listener(e); });
   }
 }

src/test/commands.test.ts

@@ -1,8 +1,8 @@
-/* 
- eslint-disable 
+/*
+ eslint-disable
   @typescript-eslint/no-unsafe-assignment,
-  @typescript-eslint/no-explicit-any, 
-  @typescript-eslint/no-unsafe-member-access 
+  @typescript-eslint/no-explicit-any,
+  @typescript-eslint/no-unsafe-member-access
 */
 
 import * as assert from 'assert';
@@ -11,7 +11,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as util from './util';
 import * as vscode from 'vscode';
-import { ImandraxLanguageClient } from '../imandrax_language_client/imandrax_language_client';
+import { ImandraXLanguageClient } from '../imandrax_language_client/imandrax_language_client';
 
 
 suite('Commands Test Suite', () => {
@@ -20,7 +20,7 @@ suite('Commands Test Suite', () => {
   });
 
   let extensionContext: vscode.ExtensionContext | undefined;
-  let imandraxLanguageClient_: ImandraxLanguageClient | undefined;
+  let imandraxLanguageClient_: ImandraXLanguageClient | undefined;
   suiteSetup(async () => {
     console.log("suite setup")
     const ext = vscode.extensions.getExtension('imandra.imandrax');
@@ -38,7 +38,7 @@ suite('Commands Test Suite', () => {
     'create terminal should increase',
     'the window.terminals.length by 1'
   ].join(' '), async () => {
-    // arrange 
+    // arrange
     console.log("get term count");
     const term_count = vscode.window.terminals.length;