[WIP] Bugfix/vcs deactivation race condition

.gitattributes

@@ -3,3 +3,6 @@
 
 # Declare text files that will always have LF line endings on checking
 oni eol=lf
+
+# Ignore the yarn library from Linguist, for the Github Language Stats.
+lib/yarn/* linguist-vendored=true

.github/config.yml

@@ -34,3 +34,5 @@ backers:
 - 8832878
 - 5127194
 - 1764368
+- 468548
+- 2318955

BACKERS.md

@@ -139,6 +139,8 @@ Thanks you to all our backers for making Oni possible!
 *   Doug Beney
 *   Aditya Gudimella
 *   Michal Hantl
+*   Lennaert Meijvogel
+*   Jonas Strømsodd
 
 <a href="https://opencollective.com/oni/tiers/backer/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/0/avatar.png"></a>
 <a href="https://opencollective.com/oni/tiers/backer/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/1/avatar.png"></a>

browser/src/App.ts

@@ -75,6 +75,7 @@ export const start = async (args: string[]): Promise<void> => {
     const themesPromise = import("./Services/Themes")
     const iconThemesPromise = import("./Services/IconThemes")
 
+    const sessionManagerPromise = import("./Services/Sessions")
     const sidebarPromise = import("./Services/Sidebar")
     const overlayPromise = import("./Services/Overlay")
     const statusBarPromise = import("./Services/StatusBar")
@@ -182,6 +183,8 @@ export const start = async (args: string[]): Promise<void> => {
     pluginManager.discoverPlugins()
     Performance.endMeasure("Oni.Start.Plugins.Discover")
 
+    const oniApi = pluginManager.getApi()
+
     Performance.startMeasure("Oni.Start.Themes")
     const Themes = await themesPromise
     const IconThemes = await iconThemesPromise
@@ -215,7 +218,6 @@ export const start = async (args: string[]): Promise<void> => {
 
     const StatusBar = await statusBarPromise
     StatusBar.activate(configuration)
-    const statusBar = StatusBar.getInstance()
 
     const Overlay = await overlayPromise
     Overlay.activate()
@@ -261,7 +263,7 @@ export const start = async (args: string[]): Promise<void> => {
     const tasks = Tasks.getInstance()
 
     const LanguageManager = await languageManagerPromise
-    LanguageManager.activate(configuration, editorManager, pluginManager, statusBar, workspace)
+    LanguageManager.activate(oniApi)
     const languageManager = LanguageManager.getInstance()
 
     Performance.startMeasure("Oni.Start.Editors")
@@ -315,24 +317,9 @@ export const start = async (args: string[]): Promise<void> => {
     const sidebarManager = Sidebar.getInstance()
 
     const VCSManager = await vcsManagerPromise
-    VCSManager.activate(
-        workspace,
-        editorManager,
-        statusBar,
-        commandManager,
-        menuManager,
-        sidebarManager,
-        notifications,
-        configuration,
-    )
+    VCSManager.activate(oniApi, sidebarManager, notifications)
 
-    Explorer.activate(
-        commandManager,
-        configuration,
-        editorManager,
-        Sidebar.getInstance(),
-        workspace,
-    )
+    Explorer.activate(oniApi, configuration, Sidebar.getInstance())
     Learning.activate(
         commandManager,
         configuration,
@@ -341,6 +328,10 @@ export const start = async (args: string[]): Promise<void> => {
         Sidebar.getInstance(),
         WindowManager.windowManager,
     )
+
+    const Sessions = await sessionManagerPromise
+    Sessions.activate(oniApi, sidebarManager)
+
     Performance.endMeasure("Oni.Start.Sidebar")
 
     const createLanguageClientsFromConfiguration =

browser/src/Editor/BufferManager.ts

@@ -338,25 +338,29 @@ export class Buffer implements IBuffer {
     public handleInput(key: string): boolean {
         const state = this._store.getState()
 
-        const layers: IBufferLayer[] = state.layers[this._id]
+        const bufferLayers: IBufferLayer[] = state.layers[this._id]
 
-        if (!layers || !layers.length) {
+        if (!bufferLayers || !bufferLayers.length) {
             return false
         }
 
-        const result = layers.reduce<boolean>((prev, curr) => {
-            if (prev) {
-                return true
-            }
+        const layerShouldHandleInput = bufferLayers.reduce<boolean>(
+            (layerHandlerExists, currentLayer) => {
+                if (layerHandlerExists) {
+                    return true
+                }
 
-            if (!curr || !curr.handleInput) {
+                if (!currentLayer || !currentLayer.handleInput) {
+                    return false
+                } else if (currentLayer.isActive && currentLayer.isActive()) {
+                    return currentLayer.handleInput(key)
+                }
                 return false
-            } else {
-                return curr.handleInput(key)
-            }
-        }, false)
+            },
+            false,
+        )
 
-        return result
+        return layerShouldHandleInput
     }
     public async updateHighlights(
         tokenColors: TokenColor[],

browser/src/Editor/Editor.ts

@@ -11,18 +11,10 @@ import * as types from "vscode-languageserver-types"
 
 import { Disposable } from "./../Utility"
 
-export interface IEditor extends Oni.Editor {
-    // Methods
-    init(filesToOpen: string[]): void
-    render(): JSX.Element
-
-    setSelection(selectionRange: types.Range): Promise<void>
-}
-
 /**
  * Base class for Editor implementations
  */
-export class Editor extends Disposable implements Oni.Editor {
+export abstract class Editor extends Disposable implements Oni.Editor {
     private _currentMode: string
     private _onBufferEnterEvent = new Event<Oni.EditorBufferEventArgs>()
     private _onBufferLeaveEvent = new Event<Oni.EditorBufferEventArgs>()
@@ -44,7 +36,10 @@ export class Editor extends Disposable implements Oni.Editor {
         return this._onCursorMoved
     }
 
+    public abstract init(filesToOpen: string[]): void
+
     // Events
+
     public get onModeChanged(): IEvent<Oni.Vim.Mode> {
         return this._onModeChangedEvent
     }
@@ -90,6 +85,10 @@ export class Editor extends Disposable implements Oni.Editor {
         return Promise.reject("Not implemented")
     }
 
+    public abstract render(): JSX.Element
+
+    public abstract setSelection(selectionRange: types.Range): Promise<void>
+
     protected setMode(mode: Oni.Vim.Mode): void {
         if (mode !== this._currentMode) {
             this._currentMode = mode

browser/src/Editor/NeovimEditor/BufferLayerManager.ts

@@ -11,6 +11,7 @@ export type BufferFilter = (buf: Oni.Buffer) => boolean
 
 export interface IBufferLayer extends Oni.BufferLayer {
     handleInput?: (key: string) => boolean
+    isActive?: () => boolean
 }
 
 export const createBufferFilterFromLanguage = (language: string) => (buf: Oni.Buffer): boolean => {
@@ -69,6 +70,13 @@ export class BufferLayerManager {
     }
 }
 
+const getInstance = (() => {
+    const instance = new BufferLayerManager()
+    return () => instance
+})()
+
+export default getInstance
+
 export const wrapReactComponentWithLayer = (
     id: string,
     component: JSX.Element,

browser/src/Editor/NeovimEditor/Definition.ts

@@ -19,7 +19,7 @@ export enum OpenType {
 export class Definition {
     constructor(private _editor: Oni.Editor, private _store: Store<State.IState>) {}
 
-    public async gotoDefinitionUnderCursor(openType: OpenType = OpenType.NewTab): Promise<void> {
+    public async gotoDefinitionUnderCursor(openOptions?: Oni.FileOpenOptions): Promise<void> {
         const activeDefinition = this._store.getState().definition
 
         if (!activeDefinition) {
@@ -31,33 +31,21 @@ export class Definition {
         const line = range.start.line
         const column = range.start.character
 
-        await this.gotoPositionInUri(uri, line, column, openType)
+        await this.gotoPositionInUri(uri, line, column, openOptions)
     }
 
     public async gotoPositionInUri(
         uri: string,
         line: number,
         column: number,
-        openType: OpenType = OpenType.NewTab,
+        openOptions?: Oni.FileOpenOptions,
     ): Promise<void> {
         const filePath = Helpers.unwrapFileUriPath(uri)
 
         const activeEditor = this._editor
-        const command = this._getCommandFromOpenType(openType)
 
-        await activeEditor.neovim.command(`${command} ${filePath}`)
+        await this._editor.openFile(filePath, openOptions)
         await activeEditor.neovim.command(`cal cursor(${line + 1}, ${column + 1})`)
         await activeEditor.neovim.command("norm zz")
     }
-
-    private _getCommandFromOpenType(openType: OpenType) {
-        switch (openType) {
-            case OpenType.SplitVertical:
-                return "vsp"
-            case OpenType.SplitHorizontal:
-                return "sp"
-            default:
-                return "e"
-        }
-    }
 }

browser/src/Editor/NeovimEditor/HoverRenderer.tsx

@@ -8,9 +8,9 @@ import * as React from "react"
 import * as types from "vscode-languageserver-types"
 
 import getTokens from "./../../Services/SyntaxHighlighting/TokenGenerator"
-import { enableMouse } from "./../../UI/components/common"
+import styled, { enableMouse } from "./../../UI/components/common"
 import { ErrorInfo } from "./../../UI/components/ErrorInfo"
-import { QuickInfoElement, QuickInfoWrapper } from "./../../UI/components/QuickInfo"
+import { QuickInfoElement } from "./../../UI/components/QuickInfo"
 import QuickInfoWithTheme from "./../../UI/components/QuickInfoContainer"
 
 import * as Helpers from "./../../Plugins/Api/LanguageClient/LanguageClientHelpers"
@@ -22,7 +22,9 @@ import { IToolTipsProvider } from "./ToolTipsProvider"
 
 const HoverToolTipId = "hover-tool-tip"
 
-const HoverRendererContainer = QuickInfoWrapper.extend`
+const HoverRendererContainer = styled.div`
+    user-select: none;
+    cursor: default;
     ${enableMouse};
 `
 

browser/src/Editor/NeovimEditor/NeovimBufferLayersView.tsx

@@ -14,8 +14,7 @@ import { NeovimActiveWindow } from "./NeovimActiveWindow"
 
 import * as State from "./NeovimEditorStore"
 
-import { StackLayer } from "../../UI/components/common"
-import { EmptyArray } from "./../../Utility"
+import styled, { StackLayer } from "../../UI/components/common"
 
 export interface NeovimBufferLayersViewProps {
     activeWindowId: number
@@ -25,23 +24,26 @@ export interface NeovimBufferLayersViewProps {
     fontPixelHeight: number
 }
 
-const InnerLayerStyle: React.CSSProperties = {
-    position: "absolute",
-    top: "0px",
-    left: "0px",
-    right: "0px",
-    bottom: "0px",
-    overflowY: "auto",
-    overflowX: "auto",
+const InnerLayer = styled.div`
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    overflow: hidden;
+`
+
+export interface LayerContextWithCursor extends Oni.BufferLayerRenderContext {
+    cursorLine: number
+    cursorColumn: number
 }
 
 export class NeovimBufferLayersView extends React.PureComponent<NeovimBufferLayersViewProps, {}> {
     public render(): JSX.Element {
         const containers = this.props.windows.map(windowState => {
-            const layers =
-                this.props.layers[windowState.bufferId] || (EmptyArray as Oni.BufferLayer[])
+            const layers: Oni.BufferLayer[] = this.props.layers[windowState.bufferId] || []
 
-            const layerContext: Oni.BufferLayerRenderContext = {
+            const layerContext: LayerContextWithCursor = {
                 isActive: windowState.windowId === this.props.activeWindowId,
                 windowId: windowState.windowId,
                 fontPixelWidth: this.props.fontPixelWidth,
@@ -53,22 +55,15 @@ export class NeovimBufferLayersView extends React.PureComponent<NeovimBufferLaye
                 visibleLines: windowState.visibleLines,
                 topBufferLine: windowState.topBufferLine,
                 bottomBufferLine: windowState.bottomBufferLine,
+                cursorColumn: windowState.column,
+                cursorLine: windowState.line,
             }
 
-            const layerElements = layers.map(l => {
+            const layerElements = layers.map(layer => {
                 return (
-                    <div
-                        key={
-                            l.id +
-                            "." +
-                            windowState.windowId.toString() +
-                            "." +
-                            windowState.bufferId.toString()
-                        }
-                        style={InnerLayerStyle}
-                    >
-                        {l.render(layerContext)}
-                    </div>
+                    <InnerLayer key={`${layer.id}.${windowState.windowId}.${windowState.bufferId}`}>
+                        {layer.render(layerContext)}
+                    </InnerLayer>
                 )
             })