Closing splits with 'editor.splits.mode' === 'oni'

browser/src/Editor/NeovimEditor/NeovimEditor.tsx

@@ -20,7 +20,7 @@ import { bindActionCreators, Store } from "redux"
 import { clipboard, ipcRenderer, remote } from "electron"
 
 import * as Oni from "oni-api"
-import { Event } from "oni-types"
+import { Event, IEvent } from "oni-types"
 
 import * as Log from "./../../Log"
 
@@ -42,7 +42,6 @@ import { commandManager } from "./../../Services/CommandManager"
 import { Completion, CompletionProviders } from "./../../Services/Completion"
 import { Configuration, IConfigurationValues } from "./../../Services/Configuration"
 import { IDiagnosticsDataSource } from "./../../Services/Diagnostics"
-import { editorManager } from "./../../Services/EditorManager"
 import { Errors } from "./../../Services/Errors"
 import { Overlay, OverlayManager } from "./../../Services/Overlay"
 import { SnippetManager } from "./../../Services/Snippets"
@@ -140,9 +139,14 @@ export class NeovimEditor extends Editor implements IEditor {
     private _toolTipsProvider: IToolTipsProvider
     private _commands: NeovimEditorCommands
     private _externalMenuOverlay: Overlay
-
     private _bufferLayerManager: BufferLayerManager
 
+    private _onNeovimQuit: Event<void> = new Event<void>()
+
+    public get onNeovimQuit(): IEvent<void> {
+        return this._onNeovimQuit
+    }
+
     public get /* override */ activeBuffer(): Oni.Buffer {
         return this._bufferManager.getBufferById(this._lastBufferId)
     }
@@ -375,10 +379,7 @@ export class NeovimEditor extends Editor implements IEditor {
         })
 
         this._neovimInstance.onLeave.subscribe(() => {
-            // TODO: Only leave if all editors are closed...
-            if (!this._configuration.getValue("debug.persistOnNeovimExit")) {
-                remote.getCurrentWindow().close()
-            }
+            this._onNeovimQuit.dispatch()
         })
 
         this._neovimInstance.onOniCommand.subscribe(command => {
@@ -664,6 +665,11 @@ export class NeovimEditor extends Editor implements IEditor {
     }
 
     public dispose(): void {
+        if (this._neovimInstance) {
+            this._neovimInstance.dispose()
+            this._neovimInstance = null
+        }
+
         if (this._syntaxHighlighter) {
             this._syntaxHighlighter.dispose()
             this._syntaxHighlighter = null
@@ -688,7 +694,6 @@ export class NeovimEditor extends Editor implements IEditor {
     }
 
     public enter(): void {
-        editorManager.setActiveEditor(this)
         Log.info("[NeovimEditor::enter]")
         this._onEnterEvent.dispatch()
         this._actions.setHasFocus(true)

browser/src/Editor/OniEditor/OniEditor.tsx

@@ -14,6 +14,8 @@ import * as types from "vscode-languageserver-types"
 import * as Oni from "oni-api"
 import { IEvent } from "oni-types"
 
+import { remote } from "electron"
+
 import * as Log from "./../../Log"
 
 import { PluginManager } from "./../../Plugins/PluginManager"
@@ -137,6 +139,22 @@ export class OniEditor implements IEditor {
             this._workspace,
         )
 
+        editorManager.registerEditor(this)
+
+        this._neovimEditor.onNeovimQuit.subscribe(() => {
+            const isSplitModeOni = this._configuration.getValue("editor.split.mode") === "oni"
+
+            if (!this._configuration.getValue("debug.persistOnNeovimExit") && !isSplitModeOni) {
+                remote.getCurrentWindow().close()
+            } else if (isSplitModeOni) {
+                const handle = windowManager.getSplitHandle(this)
+                handle.close()
+                editorManager.unregisterEditor(this)
+
+                this.dispose()
+            }
+        })
+
         this._neovimEditor.bufferLayers.addBufferLayer("*", buf =>
             wrapReactComponentWithLayer("oni.layer.scrollbar", <BufferScrollBarContainer />),
         )

browser/src/Services/EditorManager.ts

@@ -11,13 +11,16 @@
 import * as Oni from "oni-api"
 import { Event, IDisposable, IEvent } from "oni-types"
 
+import { remote } from "electron"
+
 export class EditorManager implements Oni.EditorManager {
+    private _allEditors: Oni.Editor[] = []
     private _activeEditor: Oni.Editor = null
     private _anyEditorProxy: AnyEditorProxy = new AnyEditorProxy()
     private _onActiveEditorChanged: Event<Oni.Editor> = new Event<Oni.Editor>()
 
     public get allEditors(): Oni.Editor[] {
-        return []
+        return this._allEditors
     }
 
     /**
@@ -42,6 +45,21 @@ export class EditorManager implements Oni.EditorManager {
         return this._activeEditor.openFile(filePath, openOptions)
     }
 
+    public registerEditor(editor: Oni.Editor) {
+        if (this._allEditors.indexOf(editor) === -1) {
+            this._allEditors.push(editor)
+        }
+    }
+
+    public unregisterEditor(editor: Oni.Editor): void {
+        this._allEditors = this._allEditors.filter(ed => ed !== editor)
+
+        if (this._allEditors.length === 0) {
+            // Quit?
+            remote.getCurrentWindow().close()
+        }
+    }
+
     /**
      * Internal Methods
      */

browser/src/neovim/NeovimInstance.ts

@@ -188,6 +188,7 @@ export interface INeovimInstance {
  */
 export class NeovimInstance extends EventEmitter implements INeovimInstance {
     private _neovim: Session
+    private _isDisposed: boolean = false
     private _initPromise: Promise<void>
     private _isLeaving: boolean
     private _currentVimDirectory: string
@@ -368,6 +369,13 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
         })
     }
 
+    public dispose(): void {
+        if (this._neovim) {
+            this._neovim.dispose()
+            this._neovim = null
+        }
+    }
+
     public async chdir(directoryPath: string): Promise<void> {
         await this.command(`cd! ${directoryPath}`)
     }
@@ -662,6 +670,11 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
     }
 
     private _handleNotification(_method: any, args: any): void {
+        if (this._isDisposed) {
+            Log.warn(`[NeovimInstance] - ignoring ${_method} because disposed`)
+            return
+        }
+
         args.forEach((a: any[]) => {
             const command = a[0]
             a = a.slice(1)

browser/src/neovim/Session.ts

@@ -20,6 +20,7 @@ const log = (msg: string) => {
  * Session is responsible for the Neovim msgpack session
  */
 export class Session extends EventEmitter {
+    private _isDisposed: boolean = false
     private _encoder: msgpackLite.EncodeStream
     private _decoder: msgpackLite.DecodeStream
     private _requestId: number = 0
@@ -80,7 +81,25 @@ export class Session extends EventEmitter {
         })
     }
 
+    public dispose(): void {
+        if (this._encoder) {
+            this._encoder.destroy()
+            this._encoder = null
+        }
+
+        if (this._decoder) {
+            this._decoder.destroy()
+            this._decoder = null
+        }
+
+        this._isDisposed = true
+    }
+
     public request<T>(methodName: string, args: any): Promise<T> {
+        if (this._isDisposed) {
+            Log.warn(`[Session] Ignoring request: ${methodName} because session is disposed.`)
+        }
+
         this._requestId++
         let r = null
         const promise = new Promise<T>(resolve => {