OO stuff (#64)

Author: seprov

eslint.config.mjs

@@ -24,7 +24,6 @@ export default tseslint.config(
       "@typescript-eslint/no-unsafe-member-access": "warn",
       "@typescript-eslint/dot-notation": "warn",
       "@typescript-eslint/no-explicit-any": "warn",
-      "@typescript-eslint/no-floating-promises": "warn"
     }
   },
   {

src/commands/implementations.ts

@@ -118,13 +118,13 @@ ${body}
   panel.webview.html = html;
 }
 
-export function checkAll(getClient: () => LanguageClient) {
+export async function checkAll(getClient: () => LanguageClient) {
   if (!getClient()) {
     return undefined;
   }
   const file_uri = window.activeTextEditor?.document.uri;
   if (getClient() && getClient().isRunning() && file_uri?.scheme === "file") {
-    getClient().sendRequest("workspace/executeCommand", { "command": "check-all", "arguments": [file_uri.toString()] });
+    await getClient().sendRequest("workspace/executeCommand", { "command": "check-all", "arguments": [file_uri.toString()] });
   }
 }
 
@@ -157,9 +157,9 @@ export function terminal_eval_selection(): boolean {
   return true;
 }
 
-export function clear_cache(getClient: () => LanguageClient) {
+export async function clear_cache(getClient: () => LanguageClient) {
   if (getClient()?.isRunning()) {
-    getClient().sendRequest("workspace/executeCommand", { "command": "clear-cache", "arguments": [] });
+    await getClient().sendRequest("workspace/executeCommand", { "command": "clear-cache", "arguments": [] });
   }
   return true;
 }

src/commands/registration.ts

@@ -7,13 +7,13 @@ export function register(context: ExtensionContext, imandraxLanguageClient: Iman
   const getClient = () => { return imandraxLanguageClient.getClient(); };
 
   const restart_cmd = "imandrax.restart_language_server";
-  const restart_handler = () => {
-    imandraxLanguageClient.restart({ extensionUri: context.extensionUri });
+  const restart_handler = async () => {
+    await imandraxLanguageClient.restart({ extensionUri: context.extensionUri });
   };
   context.subscriptions.push(commands.registerCommand(restart_cmd, restart_handler));
 
   const check_all_cmd = "imandrax.check_all";
-  const check_all_handler = () => { implementations.checkAll(getClient); };
+  const check_all_handler = async () => { await implementations.checkAll(getClient); };
   context.subscriptions.push(commands.registerCommand(check_all_cmd, check_all_handler));
 
   const browse_cmd = "imandrax.browse";
@@ -33,7 +33,7 @@ export function register(context: ExtensionContext, imandraxLanguageClient: Iman
   context.subscriptions.push(commands.registerCommand(terminal_eval_selection_cmd, terminal_eval_selection_handler));
 
   const clear_cache_cmd = "imandrax.clear_cache";
-  const clear_cache_handler = () => { implementations.clear_cache(getClient); };
+  const clear_cache_handler = async () => { await implementations.clear_cache(getClient); };
   context.subscriptions.push(commands.registerCommand(clear_cache_cmd, clear_cache_handler));
 
   const open_vfs_file_cmd = "imandrax.open_vfs_file";
@@ -60,10 +60,10 @@ export function register(context: ExtensionContext, imandraxLanguageClient: Iman
   context.subscriptions.push(commands.registerCommand(open_goal_state_cmd, open_goal_state_handler));
 
   const reset_goal_state_cmd = "imandrax.reset_goal_state";
-  const reset_goal_state_handler = () => {
+  const reset_goal_state_handler = async () => {
     if (getClient()?.isRunning()) {
       try {
-        getClient().sendRequest("workspace/executeCommand", { "command": "reset-goal-state", "arguments": [] });
+        await getClient().sendRequest("workspace/executeCommand", { "command": "reset-goal-state", "arguments": [] });
       }
       catch (e) {
         console.log("caught something!");

src/extension.ts

@@ -1,7 +1,6 @@
 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';
@@ -21,10 +20,11 @@ import {
 
 
 export async function activate(context: ExtensionContext) {
-  const languageClientConfig = imandraXLanguageClientConfiguration.get();
+  const getConfig = imandraxLanguageClient.configuration.get;
+  const languageClientConfig = getConfig();
 
-  if (imandraXLanguageClientConfiguration.isFoundPath(languageClientConfig)) {
-    const languageClientWrapper_ = new imandraxLanguageClient.ImandraXLanguageClient();
+  if (imandraxLanguageClient.configuration.isFoundPath(languageClientConfig)) {
+    const languageClientWrapper_ = new imandraxLanguageClient.ImandraXLanguageClient(getConfig);
     const getClient: () => LanguageClient = () => { return languageClientWrapper_.getClient(); };
 
     formatter.register();

src/imandrax_language_client/imandrax_language_client.ts

@@ -6,6 +6,7 @@ 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;
 
@@ -18,6 +19,7 @@ export class ImandraXLanguageClient {
   private readonly vfsProvider_: vfsProvider.VFSContentProvider;
   private restartCount = 0;
   private isInitial = () => { return this.client === undefined; };
+  private readonly getConfig: () => configuration.ImandraXLanguageClientConfiguration;
 
   getRestartCount(context: ExtensionContext) {
     if (context?.extensionMode === ExtensionMode.Test) {
@@ -33,13 +35,14 @@ export class ImandraXLanguageClient {
     return this.vfsProvider_;
   }
 
-  constructor() {
+  constructor(getConfig:()=>configuration.ImandraXLanguageClientConfiguration) {
+    this.getConfig = getConfig;
     this.vfsProvider_ = new vfsProvider.VFSContentProvider(() => { return this.getClient(); });
   }
 
   // Start language server
   async start(params: { extensionUri: Uri }): Promise<void> {
-    const config = configuration.get();
+    const config = this.getConfig();
 
     if (!configuration.isFoundPath(config)) {
       console.log("ImandraX binary not found, cannot start language server.");
@@ -51,7 +54,7 @@ export class ImandraXLanguageClient {
       console.log("Starting ImandraX LSP server");
     }
 
-    const serverOptions : Executable = {
+    const serverOptions: Executable = {
       command: config.binPathAvailability.path,
       args: config.serverArgs,
       options: { env: config.mergedEnv }