onivim · bryphe · May 15, 2018 · Apr 26, 2018 · May 14, 2018 · May 14, 2018
diff --git a/browser/src/neovim/NeovimInstance.ts b/browser/src/neovim/NeovimInstance.ts
@@ -384,7 +384,12 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
             this._bufferUpdateManager.notifyModeChanged(newMode)
         })
 
-        this._disposables = [s1]
+        const dispatchScroll = () => this._dispatchScrollEvent()
+
+        const s2 = this._autoCommands.onCursorMoved.subscribe(dispatchScroll)
+        const s3 = this._autoCommands.onCursorMovedI.subscribe(dispatchScroll)
+
+        this._disposables = [s1, s2, s3]
     }
 
     public dispose(): void {
@@ -656,22 +661,6 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
         return versionInfo[1].version as any
     }
 
-    public dispatchScrollEvent(): void {
-        if (this._pendingScrollTimeout || this._isDisposed) {
-            return
-        }
-
-        this._pendingScrollTimeout = window.setTimeout(async () => {
-            if (this._isDisposed) {
-                return
-            }
-
-            const evt = await this.getContext()
-            this._onScroll.dispatch(evt)
-            this._pendingScrollTimeout = null
-        })
-    }
-
     public async quit(): Promise<void> {
         // This command won't resolve the promise (since it's quitting),
         // so we're not awaiting..
@@ -701,6 +690,22 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
         }
     }
 
+    private _dispatchScrollEvent(): void {
+        if (this._pendingScrollTimeout || this._isDisposed) {
+            return
+        }
+
+        this._pendingScrollTimeout = window.setTimeout(async () => {
+            if (this._isDisposed) {
+                return
+            }
+
+            const evt = await this.getContext()
+            this._onScroll.dispatch(evt)
+            this._pendingScrollTimeout = null
+        })
+    }
+
     private _resizeInternal(rows: number, columns: number): void {
         if (this._configuration.hasValue("debug.fixedSize")) {
             const fixedSize = this._configuration.getValue("debug.fixedSize")
@@ -760,6 +765,7 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
                     break
                 case "scroll":
                     this.emit("action", Actions.scroll(a[0][0
10000
]))
+                    this._dispatchScrollEvent()
                     break
                 case "highlight_set":
                     const highlightInfo = a[a.length - 1][0]

diff --git a/browser/src/neovim/NeovimWindowManager.ts b/browser/src/neovim/NeovimWindowManager.ts
@@ -105,7 +105,6 @@ export class NeovimWindowManager extends Utility.Disposable {
             })
             .subscribe((tabState: NeovimTabPageState) => {
                 this._onWindowStateChangedEvent.dispatch(tabState)
-                this._neovimInstance.dispatchScrollEvent()
             })
     }
 

diff --git a/test/CiTests.ts b/test/CiTests.ts
@@ -8,7 +8,6 @@ import * as mkdirp from "mkdirp"
 import { IFailedTest, Oni, runInProcTest } from "./common"
 
 const LongTimeout = 5000
-
 const CiTests = [
     // Core functionality tests
     "Api.Buffer.AddLayer",
@@ -27,6 +26,7 @@ const CiTests = [
     "Editor.ExternalCommandLineTest",
     "Editor.BufferModifiedState",
     "Editor.OpenFile.PathWithSpacesTest",
+    "Editor.ScrollEventTest",
     "Editor.TabModifiedState",
     "Editor.CloseTabWithTabModesTabsTest",
     "MarkdownPreviewTest",

diff --git a/test/ci/Editor.ScrollEventTest.ts b/test/ci/Editor.ScrollEventTest.ts
@@ -0,0 +1,79 @@
+/**
+ * Test script to validate the modified status for tabs.
+ */
+
+import * as assert from "assert"
+import * as Oni from "oni-api"
+
+import { createNewFile, getElementByClassName } from "./Common"
+
+import * as os from "os"
+const createLines = (num: number): string => {
+    const ret = []
+
+    for (let i = 0; i < num; i++) {
+        ret.push(i)
+    }
+
+    return ret.join(os.EOL)
+}
+
+const assertValue = (actual: number, expected: number, msg: string, oni: Oni.Plugin.Api) => {
+    const passed = actual === expected
+
+    const notification = oni.notifications.createItem()
+    const title = passed ? "Assertion Passed" : "Assertion Failed"
+    notification.setContents(title, `${msg}\nActual: ${actual}\nExpected:${expected}`)
+    ;(notification as any).setLevel(passed ? "success" : "error")
+    notification.show()
+
+    assert.strictEqual(actual, expected, msg)
+}
+
+export const test = async (oni: Oni.Plugin.Api) => {
+    await oni.automation.waitForEditors()
+
+    await createNewFile("js", oni, createLines(500))
+
+    let scrollEventHitCount = 0
+
+    oni.editors.activeEditor.onBufferScrolled.subscribe(() => {
+        scrollEventHitCount++
+    })
+
+    await oni.automation.sendKeys("G")
+
+    await oni.automation.waitFor(() => scrollEventHitCount === 1)
+    assertValue(scrollEventHitCount, 1, "A single scroll event should've been triggered by G", oni)
+
+    await oni.automation.sendKeys("gg")
+    await oni.automation.waitFor(() => scrollEventHitCount === 2)
+    assertValue(scrollEventHitCount, 2, "Another scroll event should've been triggered by gg", oni)
+
+    await oni.automation.sendKeys(":50<cr>")
+    await oni.automation.waitFor(() => scrollEventHitCount === 3)
+    assertValue(
+        scrollEventHitCount,
+        3,
+        "Another scroll event should've been triggered by navigating to a line",
+        oni,
+    )
+
+    await oni.automation.sendKeys("<c-e>")
+    await oni.automation.waitFor(() => scrollEventHitCount === 4)
+    assertValue(
+        scrollEventHitCount,
+        4,
+        "Another scroll event should've been triggered by scrolling up one line",
+        oni,
+    )
+
+    await oni.automation.sendKeys("<c-d>")
+    await oni.automation.waitFor(() => scrollEventHitCount === 5)
+    assertValue(
+        scrollEventHitCount,
+        5,
+        "Another scroll event should've been triggered by scrolling down one line",
+        oni,
+    )
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                 })
                 .subscribe((tabState: NeovimTabPageState) => {
                     this._onWindowStateChangedEvent.dispatch(tabState)
-                    this._neovimInstance.dispatchScrollEvent()
                 })
         }
@@ Expand Down @@