Skip to content
This repository has been archived by the owner on Apr 1, 2020. It is now read-only.

Feature/Fix incorrect window positions passed to buffer layers #2605

Merged
merged 4 commits into from
Oct 4, 2018
Merged

Feature/Fix incorrect window positions passed to buffer layers #2605

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d7dcfa
query window top line and bottom line manually when remeasuring the w…
akinsho Oct 3, 2018
e267089
Merge branch 'master' of https://github.com/onivim/oni into feature/f…
akinsho Oct 3, 2018
91c0f86
add typing to the atomic calls
akinsho Oct 3, 2018
bd9800e
create legible types for remeasure atomic calls
akinsho Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions browser/src/neovim/NeovimWindowManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah interesting - nice catch! 👍

// 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
Expand Down Expand Up @@ -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,
Expand Down