Merge pull request #31 from CodinGame/fix-workspace-dispose

Fix workspace disposal

Author: CGNonofr

package-lock.json

@@ -63,7 +63,7 @@
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-unused-imports": "2.0.0",
     "jest": "^27.5.1",
-    "monaco-languageclient": "^0.18.1",
+    "monaco-languageclient": "^0.19.0-next.1",
     "proxy-polyfill": "^0.3.2",
     "rollup": "2.70.2",
     "rollup-plugin-dts": "^4.2.1",

package.json

@@ -55,26 +55,22 @@ function autoSaveModels (services: CgMonacoServices): Disposable {
   return disposableCollection
 }
 
-let services: CgMonacoServices | null = null
 let serviceDisposable: Disposable | null = null
 let serviceReferenceCount = 0
 function installServices (infrastructure: Infrastructure): Disposable {
-  if (services == null) {
-    // FIXME: we can't recreate services because MonacoWorkspace can't be disposed without memory leaks
-    // fix me as soon as https://github.com/TypeFox/monaco-languageclient/pull/330/files is released
+  if (serviceReferenceCount === 0) {
+    const disposableCollection = new DisposableCollection()
+
     const m2p = new MonacoToProtocolConverter(monaco)
     const p2m = new ProtocolToMonacoConverter(monaco)
-    services = {
+    const services = {
       commands: new MonacoCommands(monaco),
       languages: new MonacoLanguages(monaco, p2m, m2p),
       workspace: new CodinGameMonacoWorkspace(p2m, m2p, infrastructure.rootUri, infrastructure.workspaceFolders),
       window: new WatchableConsoleWindow()
     }
-  }
-
-  if (serviceReferenceCount === 0) {
-    const disposableCollection = new DisposableCollection()
 
+    disposableCollection.push(services.workspace)
     disposableCollection.push(installCommands(services))
     disposableCollection.push(Services.install(services))
 

src/services.ts

@@ -72,4 +72,11 @@ export default class CodinGameMonacoWorkspace extends MonacoWorkspace {
       }))
     }
   }
+
+  override dispose (): void {
+    super.dispose()
+    this.configurations.dispose()
+    this.onWillSaveTextDocumentEmitter.dispose()
+    this.onDidSaveTextDocumentEmitter.dispose()
+  }
 }

src/services/CodinGameMonacoWorkspace.ts

@@ -1,5 +1,5 @@
 import {
-  Configurations, ConfigurationChangeEvent, WorkspaceConfiguration, Event, Emitter
+  Configurations, ConfigurationChangeEvent, WorkspaceConfiguration, Event, Emitter, Disposable, DisposableCollection
 } from 'monaco-languageclient'
 import * as monaco from 'monaco-editor'
 
@@ -38,8 +38,16 @@ class MemoryWorkspaceConfiguration implements WorkspaceConfiguration {
 }
 
 const simpleConfigurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService) as monaco.extra.StandaloneConfigurationService
-class Configuration implements Configurations {
+class Configuration implements Configurations, Disposable {
   protected readonly onDidChangeConfigurationEmitter = new Emitter<ConfigurationChangeEvent>()
+  private disposableCollection = new DisposableCollection()
+
+  constructor () {
+    this.disposableCollection.push(this.onDidChangeConfigurationEmitter)
+    this.disposableCollection.push(simpleConfigurationService.onDidChangeConfiguration((event) => {
+      this.onDidChangeConfigurationEmitter.fire(event)
+    }))
+  }
 
   getConfiguration (section?: string, resource?: string): MemoryWorkspaceConfiguration {
     return new MemoryWorkspaceConfiguration(this.getValue(section, resource))
@@ -56,7 +64,11 @@ class Configuration implements Configurations {
   }
 
   get onDidChangeConfiguration (): Event<ConfigurationChangeEvent> {
-    return simpleConfigurationService.onDidChangeConfiguration
+    return this.onDidChangeConfigurationEmitter.event
+  }
+
+  dispose (): void {
+    this.disposableCollection.dispose()
   }
 }