From d354c2cc1ed5f704f3a3a94c35ea3d155a6c6698 Mon Sep 17 00:00:00 2001
From: Akin <akin.sowemimo@gmail.com>
Date: Thu, 4 Oct 2018 08:08:28 +0100
Subject: [PATCH] Feature/Fix incorrect window positions passed to buffer
 layers (#2605)

This PR adds a call to the `remeasure` function to derive the window top and bottom lines as previously this was obtained from the various events and the buffer update function was passing incorrect
---
 browser/src/neovim/NeovimWindowManager.ts | 31 +++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/browser/src/neovim/NeovimWindowManager.ts b/browser/src/neovim/NeovimWindowManager.ts
index c9e7d05d27..579907ac26 100644
--- a/browser/src/neovim/NeovimWindowManager.ts
+++ b/browser/src/neovim/NeovimWindowManager.ts
@@ -50,6 +50,11 @@ export interface NeovimActiveWindowState {
     dimensions: Oni.Shapes.Rectangle
 }
 
+type Lines = string[]
+type Height = number
+type Width = number
+type WindowPosition = [number, number]
+
 export interface NeovimInactiveWindowState {
     windowNumber: number
     dimensions: Oni.Shapes.Rectangle
@@ -167,31 +172,33 @@ export class NeovimWindowManager extends Utility.Disposable {
         currentWinId: number,
         context: EventContext,
     ): Promise<NeovimActiveWindowState> {
+        // We query the top and bottom line positions again despite these being on the context
+        // as the values from the `BufferUpdate` event can be incorrect
+        const [topLine, bottomLine] = await Promise.all([
+            this._neovimInstance.callFunction("line", ["w0"]),
+            this._neovimInstance.callFunction("line", ["w$"]),
+        ])
         const atomicCalls = [
             ["nvim_win_get_position", [currentWinId]],
             ["nvim_win_get_width", [currentWinId]],
             ["nvim_win_get_height", [currentWinId]],
-            [
-                "nvim_buf_get_lines",
-                [context.bufferNumber, context.windowTopLine - 1, context.windowBottomLine, false],
-            ],
+            ["nvim_buf_get_lines", [context.bufferNumber, topLine - 1, bottomLine, false]],
         ]
 
-        const response = await this._neovimInstance.request("nvim_call_atomic", [atomicCalls])
+        const response = await this._neovimInstance.request<
+            Array<[WindowPosition, Width, Height, Lines]>
+        >("nvim_call_atomic", [atomicCalls])
 
         if (!response) {
             return null
         }
 
-        const values = response[0]
+        const [values] = response
 
         if (values.length === 4) {
             // Grab the results of the `nvim_atomic_call`, as they are returned in an array
-            const position = values[0]
+            const [position, width, height, lines] = values
             const [row, col] = position
-            const width = values[1]
-            const height = values[2]
-            const lines = values[3]
 
             // The 'gutterOffset' (difference between `wincol` and `column`) is the size of the gutter
             // (for example, line numbers). The buffer isn't in that space, so we need to account
@@ -270,10 +277,8 @@ export class NeovimWindowManager extends Utility.Disposable {
 
         if (values.length === 3) {
             // Grab the results of the `nvim_atomic_call`, as they are returned in an array
-            const position = values[0]
+            const [position, width, height] = values
             const [row, col] = position
-            const width = values[1]
-            const height = values[2]
 
             const dimensions = {
                 x: col,