Fix for onivim#2414 - truncated copy/paste

psxpaul · Aug 20, 2018 · 3575709 · 3575709
1 parent dd4b33d
commit 3575709
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 16 deletions.
diff --git a/browser/src/Editor/NeovimEditor/NeovimEditorCommands.ts b/browser/src/Editor/NeovimEditor/NeovimEditorCommands.ts
@@ -4,16 +4,12 @@
  * Contextual commands for NeovimEditor
  *
  */
-import * as os from "os"
-
-import { clipboard } from "electron"
 import * as Oni from "oni-api"
 
 import { NeovimInstance } from "./../../neovim"
 import { CallbackCommand, CommandManager } from "./../../Services/CommandManager"
 import { ContextMenuManager } from "./../../Services/ContextMenu"
 import { findAllReferences, format, LanguageEditorIntegration } from "./../../Services/Language"
-import { replaceAll } from "./../../Utility"
 
 import { Definition } from "./Definition"
 import { Rename } from "./Rename"
@@ -66,14 +62,10 @@ export class NeovimEditorCommands {
         })
 
         const pasteContents = async (neovimInstance: NeovimInstance) => {
-            const textToPaste = clipboard.readText()
-            const sanitizedText = replaceAll(textToPaste, { "<": "<lt>" })
-                .split(os.EOL)
-                .join("<cr>")
-
-            await neovimInstance.command("set paste")
-            await neovimInstance.input(sanitizedText)
-            await neovimInstance.command("set nopaste")
+            // const textToPaste = clipboard.readText()
+            // const sanitizedTextLines = replaceAll(textToPaste, { "'": "''" })
+            // await neovimInstance.command("let @+='" + sanitizedTextLines + "'")
+            await neovimInstance.command('normal! "+p')
         }
 
         const commands = [
@@ -116,7 +108,13 @@ export class NeovimEditorCommands {
                 "editor.clipboard.yank",
                 "Clipboard: Yank",
                 "Yank contents to clipboard",
-                () => this._neovimInstance.input("y"),
+                () => this._neovimInstance.command('normal! "+y'),
+            ),
+            new CallbackCommand(
+                "editor.clipboard.cut",
+                "Clipboard: Cut",
+                "Cut contents to clipboard",
+                () => this._neovimInstance.command('normal! "+x'),
             ),
             new CallbackCommand("oni.editor.findAllReferences", null, null, () =>
                 findAllReferences(),

diff --git a/browser/src/Input/KeyBindings.ts b/browser/src/Input/KeyBindings.ts
@@ -56,6 +56,7 @@ export const applyDefaultKeyBindings = (oni: Oni.Plugin.Api, config: Configurati
         input.bind("<m-,>", "oni.config.openConfigJs")
 
         if (config.getValue("editor.clipboard.enabled")) {
+            input.bind("<m-x>", "editor.clipboard.cut", isVisualMode)
             input.bind("<m-c>", "editor.clipboard.yank", isVisualMode)
             input.bind("<m-v>", "editor.clipboard.paste", isInsertOrCommandMode)
         }
@@ -79,6 +80,7 @@ export const applyDefaultKeyBindings = (oni: Oni.Plugin.Api, config: Configurati
         input.bind("<c-,>", "oni.config.openConfigJs")
 
         if (config.getValue("editor.clipboard.enabled")) {
+            input.bind("<c-x>", "editor.clipboard.cut", isVisualMode)
             input.bind("<c-c>", "editor.clipboard.yank", isVisualMode)
             input.bind("<c-v>", "editor.clipboard.paste", isInsertOrCommandMode)
         }

diff --git a/main/src/menu.ts b/main/src/menu.ts
@@ -288,19 +288,19 @@ export const buildMenu = (mainWindow, loadInit) => {
             {
                 label: "Copy",
                 click(item, focusedWindow) {
-                    executeVimCommand(focusedWindow, '\\"+y')
+                    executeOniCommand(focusedWindow, "editor.clipboard.yank")
                 },
             },
             {
                 label: "Cut",
                 click(item, focusedWindow) {
-                    executeVimCommand(focusedWindow, '\\"+x')
+                    executeOniCommand(focusedWindow, "editor.clipboard.cut")
                 },
             },
             {
                 label: "Paste",
                 click(item, focusedWindow) {
-                    executeVimCommand(focusedWindow, '\\"+gP')
+                    executeOniCommand(focusedWindow, "editor.clipboard.paste")
                 },
             },
             {

diff --git a/test/CiTests.ts b/test/CiTests.ts
@@ -43,6 +43,7 @@ const CiTests = [
     "Neovim.CallOniCommands",
     "NoInstalledNeovim",
     "Sidebar.ToggleSplitTest",
+    "LargePasteTest",
 
     "Snippets.BasicInsertTest",
 

diff --git a/test/ci/LargePasteTest.ts b/test/ci/LargePasteTest.ts
@@ -0,0 +1,72 @@
+/**
+ * Test for pasting a large number of lines
+ *
+ * Regression test for #2414
+ */
+import * as Oni from "oni-api"
+
+import { createNewFile, getTemporaryFilePath, navigateToFile } from "./Common"
+
+export const test = async (oni: Oni.Plugin.Api) => {
+    const filePath = createLargeTestFile()
+    await oni.automation.waitForEditors()
+
+    navigateToFile(filePath, oni)
+
+    await oni.automation.sendKeys("<s-v>")
+    await oni.automation.waitFor(() => oni.editors.activeEditor.mode === "visual", 30000)
+
+    await oni.automation.sendKeys("G")
+    await oni.automation.waitFor(
+        () => oni.editors.activeEditor.activeBuffer.cursor.line === 1999,
+        30000,
+    )
+
+    await copy(oni)
+    await paste(oni)
+
+    await oni.automation.waitFor(
+        () => oni.editors.activeEditor.activeBuffer.lineCount === 4001,
+        30000,
+    )
+}
+
+import * as fs from "fs"
+import * as os from "os"
+
+const createLargeTestFile = (): string => {
+    const filePath = getTemporaryFilePath("js")
+    const line =
+        "this is a line of 'text' that will be repeated a bunch of times to make for a large wall of 'text' to paste"
+
+    const lines = []
+    for (let i = 0; i < 2000; i++) {
+        lines.push(line)
+    }
+
+    fs.writeFileSync(filePath, lines.join(os.EOL))
+    return filePath
+}
+
+import { isMac } from "../../browser/src/Platform"
+
+const copy = async (oni: Oni.Plugin.Api) => {
+    if (isMac()) {
+        await oni.automation.sendKeys("<m-c>")
+    } else {
+        await oni.automation.sendKeys("<c-c>")
+    }
+
+    await oni.automation.waitFor(() => oni.editors.activeEditor.mode === "normal", 30000)
+}
+
+const paste = async (oni: Oni.Plugin.Api) => {
+    await oni.automation.sendKeys("o")
+    await oni.automation.waitFor(() => oni.editors.activeEditor.mode === "insert", 30000)
+
+    if (isMac()) {
+        await oni.automation.sendKeys("<m-v>")
+    } else {
+        await oni.automation.sendKeys("<c-v>")
+    }
+}