Merge pull request #36 from CodinGame/never-uninstall-services

Never uninstall service but reinitialize them instead

Author: CGNonofr

src/languageClient.ts

@@ -3,7 +3,7 @@ import {
   CloseAction, ErrorAction, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State, DisposableCollection, CancellationToken, RequestType, NotificationType, LogMessageNotification
 } from 'monaco-languageclient'
 import delay from 'delay'
-import { installServices } from './services'
+import { updateServices } from './services'
 import createLanguageClient from './createLanguageClient'
 import { WillShutdownParams } from './customRequests'
 import { FileSystemFeature, InitializeTextDocumentFeature, WillDisposeFeature } from './extensions'
@@ -298,15 +298,9 @@ function createLanguageClientManager (
     }
   }
 
-  const serviceDisposable = installServices(infrastructure)
+  updateServices(infrastructure)
 
-  const languageClientManager = new LanguageClientManager(id, languageServerOptions, infrastructure)
-
-  languageClientManager.onDidClose(() => {
-    serviceDisposable.dispose()
-  })
-
-  return languageClientManager
+  return new LanguageClientManager(id, languageServerOptions, infrastructure)
 }
 
 export {

src/services.ts

@@ -1,7 +1,7 @@
 
 import * as monaco from 'monaco-editor'
 import {
-  Services, MonacoToProtocolConverter, ProtocolToMonacoConverter, MonacoLanguages, TextDocumentSaveReason, MonacoCommands, DisposableCollection
+  Services, MonacoToProtocolConverter, ProtocolToMonacoConverter, MonacoLanguages, MonacoCommands
 } from 'monaco-languageclient'
 import { RenameFile, CreateFile, WorkspaceEdit, Disposable } from 'vscode-languageserver-protocol'
 import WatchableConsoleWindow from './services/WatchableConsoleWindow'
@@ -29,72 +29,31 @@ function installCommands (services: CgMonacoServices): Disposable {
   })
 }
 
-function autoSaveModels (services: CgMonacoServices): Disposable {
-  const disposableCollection = new DisposableCollection()
-  const timeoutMap = new Map<string, number>()
-  disposableCollection.push(services.workspace.onDidChangeTextDocument(e => {
-    const timeout = timeoutMap.get(e.textDocument.uri)
-    if (timeout != null) {
-      window.clearTimeout(timeout)
-      timeoutMap.delete(e.textDocument.uri)
-    }
-    timeoutMap.set(e.textDocument.uri, window.setTimeout(() => {
-      timeoutMap.delete(e.textDocument.uri)
-      services.workspace.saveDocument(e.textDocument, TextDocumentSaveReason.AfterDelay).catch((error: Error) => {
-        monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save the document ${e.textDocument.uri.toString()}`, {
-          cause: error
-        }))
-      })
-    }, 500))
-  }))
-  disposableCollection.push(Disposable.create(() => {
-    for (const timeout of Array.from(timeoutMap.values())) {
-      window.clearTimeout(timeout)
-    }
-  }))
-  return disposableCollection
+const m2p = new MonacoToProtocolConverter(monaco)
+const p2m = new ProtocolToMonacoConverter(monaco)
+const services = {
+  commands: new MonacoCommands(monaco),
+  languages: new MonacoLanguages(monaco, p2m, m2p),
+  workspace: new CodinGameMonacoWorkspace(p2m, m2p, 'file:///tmp/project'),
+  window: new WatchableConsoleWindow()
 }
 
-let serviceDisposable: Disposable | null = null
-let serviceReferenceCount = 0
-function installServices (infrastructure: Infrastructure): Disposable {
-  if (serviceReferenceCount === 0) {
-    const disposableCollection = new DisposableCollection()
-
-    const m2p = new MonacoToProtocolConverter(monaco)
-    const p2m = new ProtocolToMonacoConverter(monaco)
-    const services = {
-      commands: new MonacoCommands(monaco),
-      languages: new MonacoLanguages(monaco, p2m, m2p),
-      workspace: new CodinGameMonacoWorkspace(p2m, m2p, infrastructure.rootUri, infrastructure.workspaceFolders),
-      window: new WatchableConsoleWindow()
-    }
-
-    disposableCollection.push(services.workspace)
-    disposableCollection.push(installCommands(services))
-    disposableCollection.push(Services.install(services))
+installCommands(services)
+Services.install(services)
 
-    if (!infrastructure.automaticTextDocumentUpdate) {
-      disposableCollection.push(autoSaveModels(services))
-    }
-    serviceDisposable = disposableCollection
-  }
-  serviceReferenceCount++
-
-  return Disposable.create(() => {
-    serviceReferenceCount--
-    if (serviceReferenceCount <= 0) {
-      serviceDisposable?.dispose()
-      serviceDisposable = null
-    }
-  })
+function updateServices (infrastructure: Infrastructure): void {
+  services.workspace.initialize(
+    infrastructure.rootUri,
+    infrastructure.workspaceFolders,
+    !infrastructure.automaticTextDocumentUpdate
+  )
 }
 
 function getServices (): CgMonacoServices {
   return Services.get()! as CgMonacoServices
 }
 
 export {
-  installServices,
+  updateServices,
   getServices
 }

src/services/CodinGameMonacoWorkspace.ts

@@ -1,6 +1,6 @@
 import {
   MonacoWorkspace, TextDocument, TextDocumentSaveReason,
-  ProtocolToMonacoConverter, MonacoToProtocolConverter, Emitter, Event, TextDocumentWillSaveEvent, Disposable
+  ProtocolToMonacoConverter, MonacoToProtocolConverter, Emitter, Event, TextDocumentWillSaveEvent, Disposable, DisposableCollection
 } from 'monaco-languageclient'
 import * as monaco from 'monaco-editor'
 import type * as vscode from 'vscode'
@@ -17,23 +17,40 @@ export default class CodinGameMonacoWorkspace extends MonacoWorkspace {
 
   configurations = new Configuration()
 
+  private autoSaveModelDisposable: Disposable | undefined
+
+  public workspaceFolders: typeof vscode.workspace.workspaceFolders
+
   constructor (
     p2m: ProtocolToMonacoConverter,
     m2p: MonacoToProtocolConverter,
-    _rootUri: string | null = null,
-    public workspaceFolders: typeof vscode.workspace.workspaceFolders
+    rootUri: string | null = null
   ) {
-    super(monaco, p2m, m2p, _rootUri)
+    super(monaco, p2m, m2p, rootUri)
+  }
 
-    // "workaround" for https://github.com/TypeFox/monaco-languageclient/pull/199#issuecomment-593414330
-    if (this.workspaceFolders == null && _rootUri != null) {
-      const uri = monaco.Uri.parse(_rootUri)
+  public initialize (
+    rootUri: string | null = null,
+    workspaceFolders: typeof vscode.workspace.workspaceFolders,
+    autoSaveModels: boolean
+  ): void {
+    this._rootUri = rootUri
+    if (workspaceFolders != null) {
+      this.workspaceFolders = workspaceFolders
+    } else if (rootUri != null) {
+      const uri = monaco.Uri.parse(rootUri)
       this.workspaceFolders = [{
         uri,
         index: 0,
         name: uri.toString()
       }]
     }
+    if (autoSaveModels && this.autoSaveModelDisposable == null) {
+      this.autoSaveModelDisposable = this.autoSaveModels()
+    } else if (!autoSaveModels && this.autoSaveModelDisposable != null) {
+      this.autoSaveModelDisposable.dispose()
+      this.autoSaveModelDisposable = undefined
+    }
   }
 
   get onWillSaveTextDocument (): Event<TextDocumentWillSaveEvent> {
@@ -73,8 +90,35 @@ export default class CodinGameMonacoWorkspace extends MonacoWorkspace {
     }
   }
 
+  private autoSaveModels (): Disposable {
+    const disposableCollection = new DisposableCollection()
+    const timeoutMap = new Map<string, number>()
+    disposableCollection.push(this.onDidChangeTextDocument(e => {
+      const timeout = timeoutMap.get(e.textDocument.uri)
+      if (timeout != null) {
+        window.clearTimeout(timeout)
+        timeoutMap.delete(e.textDocument.uri)
+      }
+      timeoutMap.set(e.textDocument.uri, window.setTimeout(() => {
+        timeoutMap.delete(e.textDocument.uri)
+        this.saveDocument(e.textDocument, TextDocumentSaveReason.AfterDelay).catch((error: Error) => {
+          monaco.errorHandler.onUnexpectedError(new Error(`[LSP] Unable to save the document ${e.textDocument.uri.toString()}`, {
+            cause: error
+          }))
+        })
+      }, 500))
+    }))
+    disposableCollection.push(Disposable.create(() => {
+      for (const timeout of Array.from(timeoutMap.values())) {
+        window.clearTimeout(timeout)
+      }
+    }))
+    return disposableCollection
+  }
+
   override dispose (): void {
     super.dispose()
+    this.autoSaveModelDisposable?.dispose()
     this.configurations.dispose()
     this.onWillSaveTextDocumentEmitter.dispose()
     this.onDidSaveTextDocumentEmitter.dispose()