Merge pull request #936 from atom/fix-retained-editor-references

Remove editor from watchedEditors when editor is destroyed
atom · Dec 8, 2017 · cbe2ac5 · cbe2ac5
2 parents b1dcef9 + 0caa1d2
commit cbe2ac5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/autocomplete-manager.js b/lib/autocomplete-manager.js
@@ -179,13 +179,18 @@ class AutocompleteManager {
     this.subscriptions.add(disposable)
     return new Disposable(() => {
       disposable.dispose()
-      this.subscriptions.remove(disposable)
+      if (this.subscriptions != null) {
+        this.subscriptions.remove(disposable)
+      }
       this.watchedEditors.delete(editor)
     })
   }
 
   handleEvents () {
-    this.subscriptions.add(atom.workspace.observeTextEditors((editor) => { this.watchEditor(editor, ['workspace-center']) }))
+    this.subscriptions.add(atom.workspace.observeTextEditors((editor) => {
+      const disposable = this.watchEditor(editor, ['workspace-center'])
+      editor.onDidDestroy(() => disposable.dispose())
+    }))
 
     // Watch config values
     this.subscriptions.add(atom.config.observe('autosave.enabled', (value) => { this.autosaveEnabled = value }))