Revert "vfsProviderProvider"

This reverts commit 5ea1c76.

Author: Sebastian Provenzano

src/extension.ts

@@ -4,7 +4,6 @@ import * as formatter from './formatter';
 import * as imandraxLanguageClient from './imandrax_language_client/imandrax_language_client';
 import * as installer from './installer';
 import * as listeners from './listeners';
-import * as vfsProvider from './vfs_provider';
 
 import {
   env,
@@ -25,8 +24,7 @@ export async function activate(context: ExtensionContext) {
   const languageClientConfig = getConfig();
 
   if (imandraxLanguageClient.configuration.isFoundPath(languageClientConfig)) {
-    const vfsProviderProvider = (client: LanguageClient) => { return new vfsProvider.VFSContentProvider(client) };
-    const languageClientWrapper_ = new imandraxLanguageClient.ImandraXLanguageClient(getConfig, vfsProviderProvider);
+    const languageClientWrapper_ = new imandraxLanguageClient.ImandraXLanguageClient(getConfig);
     const getClient: () => LanguageClient = () => { return languageClientWrapper_.getClient(); };
 
     formatter.register();

src/imandrax_language_client/imandrax_language_client.ts

@@ -16,11 +16,10 @@ export interface RestartParams {
 
 export class ImandraXLanguageClient {
   private client!: LanguageClient;
-  private vfsProvider_!: vfsProvider.VFSContentProvider;
+  private readonly vfsProvider_: vfsProvider.VFSContentProvider;
   private restartCount = 0;
   private isInitial = () => { return this.client === undefined; };
   private readonly getConfig: () => configuration.ImandraXLanguageClientConfiguration;
-  private readonly vfsProviderProvider: (_: LanguageClient) => vfsProvider.VFSContentProvider;
 
   getRestartCount(context: ExtensionContext) {
     if (context?.extensionMode === ExtensionMode.Test) {
@@ -36,9 +35,9 @@ export class ImandraXLanguageClient {
     return this.vfsProvider_;
   }
 
-  constructor(getConfig: () => configuration.ImandraXLanguageClientConfiguration, vfsProviderProvider: (_: LanguageClient) => vfsProvider.VFSContentProvider) {
+  constructor(getConfig:()=>configuration.ImandraXLanguageClientConfiguration) {
     this.getConfig = getConfig;
-    this.vfsProviderProvider = vfsProviderProvider;
+    this.vfsProvider_ = new vfsProvider.VFSContentProvider(() => { return this.getClient(); });
   }
 
   // Start language server
@@ -82,9 +81,6 @@ export class ImandraXLanguageClient {
       clientOptions
     );
 
-    // don't forget to construct the vfsProvider with the new client!
-    this.vfsProvider_ = this.vfsProviderProvider(this.client);
-
     const { extensionUri } = params;
 
     if (was_initial) {

src/vfs_provider.ts

@@ -5,10 +5,10 @@ import { LanguageClient } from 'vscode-languageclient/node';
 export class VFSContentProvider implements TextDocumentContentProvider {
   onDidChangeEmitter = new EventEmitter<Uri>();
   onDidChange = this.onDidChangeEmitter.event;
-  private readonly client: LanguageClient;
+  private readonly getClient: () => LanguageClient;
 
-  constructor(client: LanguageClient) {
-    this.client = client;
+  constructor(getClient: () => LanguageClient) {
+    this.getClient = getClient;
   }
 
   async provideTextDocumentContent(uri: Uri): Promise<string> {
@@ -17,6 +17,6 @@ export class VFSContentProvider implements TextDocumentContentProvider {
       const auth = (fst[0] === "") ? fst[1] : fst[0];
       uri = uri.with({ authority: auth });
     }
-    return await this.client.sendRequest<string>("$imandrax/req-vfs-file", { "uri": uri });
+    return await this.getClient().sendRequest<string>("$imandrax/req-vfs-file", { "uri": uri });
   }
 }