Merge pull request #30 from CodinGame/fix-file-handler-disconnected

Do not bind file handlers while disconnected

Author: CGNonofr

src/languageClient.ts

@@ -1,6 +1,6 @@
 import * as monaco from 'monaco-editor'
 import {
-  CloseAction, ErrorAction, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State, DisposableCollection, CancellationToken, RequestType, NotificationType, LogMessageNotification
+  CloseAction, ErrorAction, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State, DisposableCollection, CancellationToken, RequestType, NotificationType, LogMessageNotification, Disposable
 } from 'monaco-languageclient'
 import delay from 'delay'
 import { Uri } from 'monaco-editor'
@@ -29,7 +29,6 @@ export class LanguageClientManager implements LanguageClient {
   private disposed: boolean = false
   protected readonly onDidChangeStatusEmitter = new Emitter<StatusChangeEvent>()
   protected readonly onErrorEmitter = new Emitter<Error>()
-  protected readonly onWillCloseEmitter = new Emitter<void>()
   protected readonly onDidCloseEmitter = new Emitter<void>()
   protected readonly onWillShutdownEmitter = new Emitter<WillShutdownParams>()
   protected currentStatus: Status = 'connecting'
@@ -60,7 +59,6 @@ export class LanguageClientManager implements LanguageClient {
 
   async dispose (): Promise<void> {
     this.disposed = true
-    this.onWillCloseEmitter.fire()
     try {
       if (this.languageClient != null) {
         const languageClient = this.languageClient
@@ -76,10 +74,6 @@ export class LanguageClientManager implements LanguageClient {
     return this.onDidChangeStatusEmitter.event
   }
 
-  get onWillClose (): Event<void> {
-    return this.onWillCloseEmitter.event
-  }
-
   get onDidClose (): Event<void> {
     return this.onDidCloseEmitter.event
   }
@@ -211,6 +205,7 @@ export class LanguageClientManager implements LanguageClient {
     this.languageClient = languageClient
 
     let readyPromise: Promise<void> | null = null
+    let fileHandlerRegistration: Disposable | null = null
     languageClient.onDidChangeState(async (state) => {
       switch (state.newState) {
         case State.Starting: {
@@ -247,6 +242,7 @@ export class LanguageClientManager implements LanguageClient {
           break
         }
         case State.Running: {
+          fileHandlerRegistration = this.registerFileHandlers()
           this.updateStatus('connected')
 
           await readyPromise
@@ -255,6 +251,9 @@ export class LanguageClientManager implements LanguageClient {
           break
         }
         case State.Stopped: {
+          fileHandlerRegistration?.dispose()
+          fileHandlerRegistration = null
+
           this.updateStatus('closed')
           break
         }
@@ -277,13 +276,28 @@ export class LanguageClientManager implements LanguageClient {
   sendRequest<P, R, E> (type: RequestType<P, R, E>, params: P): Promise<R> {
     return this.languageClient!.sendRequest<P, R, E>(type, params)
   }
+
+  private registerFileHandlers (): Disposable {
+    const disposableCollection = new DisposableCollection()
+    const languageClientManager = this
+    disposableCollection.push(registerTextModelContentProvider('file', {
+      async provideTextContent (resource: Uri): Promise<monaco.editor.ITextModel | null> {
+        return await languageClientManager.infrastructure.getFileContent(resource, languageClientManager)
+      }
+    }))
+    disposableCollection.push(getServices().workspace.registerSaveDocumentHandler({
+      async saveTextContent (textDocument, reason) {
+        await languageClientManager.infrastructure.saveFileContent?.(textDocument, reason, languageClientManager)
+      }
+    }))
+    return disposableCollection
+  }
 }
 
 /**
  * Create a language client manager
  * @param id The predefined id of the language client
  * @param infrastructure The infrastructure to use
- * @param parameters the infrastructure parameters
  * @returns A language client manager
  */
 function createLanguageClientManager (
@@ -305,26 +319,10 @@ function createLanguageClientManager (
     }
   }
 
-  const disposableCollection = new DisposableCollection()
-
   const serviceDisposable = installServices(infrastructure)
 
   const languageClientManager = new LanguageClientManager(id, languageServerOptions, infrastructure)
 
-  disposableCollection.push(registerTextModelContentProvider('file', {
-    async provideTextContent (resource: Uri): Promise<monaco.editor.ITextModel | null> {
-      return await infrastructure.getFileContent(resource, languageClientManager)
-    }
-  }))
-  disposableCollection.push(getServices().workspace.registerSaveDocumentHandler({
-    async saveTextContent (textDocument, reason) {
-      await infrastructure.saveFileContent?.(textDocument, reason, languageClientManager)
-    }
-  }))
-
-  languageClientManager.onWillClose(() => {
-    disposableCollection.dispose()
-  })
   languageClientManager.onDidClose(() => {
     serviceDisposable.dispose()
   })