Dependency: libvim -> 8.10869.43 (#116)

* Dependency: libvim -> 8.10869.42

* Update clipboard API

* Bump to [email protected]

* Add clipboard cases for blockType character

Author: bryphe

doc.esy.lock/index.json

@@ -18,7 +18,7 @@
     "@esy-ocaml/reason": "^3.4.0",
     "refmterr": "*",
     "ocaml": ">=4.7.0 <4.10.0",
-    "libvim": "8.10869.41",
+    "libvim": "8.10869.43",
     "editor-core-types": "onivim/editor-core-types#6a8afaf"
   },
   "resolutions": {

esy.lock/index.json

@@ -1,6 +1,15 @@
 type buffer;
 
-type clipboardProvider = int => option(array(string));
+type blockType =
+  | Line
+  | Character;
+
+type clipboardContents = {
+  lines: array(string),
+  blockType,
+};
+
+type clipboardProvider = int => option(clipboardContents);
 
 type lineEnding =
   | CR

package.json

@@ -240,9 +240,10 @@ void onWindowSplit(windowSplit_T splitType, char_u *path) {
   CAMLreturn0;
 }
 
-int getClipboardCallback(int regname, int *num_lines, char_u ***lines) {
+int getClipboardCallback(int regname, int *num_lines, char_u ***lines,
+                         int *blockType) {
   CAMLparam0();
-  CAMLlocal1(clipboardArray);
+  CAMLlocal3(vRecord, clipboardArray, vBlockType);
 
   static const value *lv_clipboardGet = NULL;
 
@@ -255,7 +256,16 @@ int getClipboardCallback(int regname, int *num_lines, char_u ***lines) {
   int ret = 0;
   // Some
   if (Is_block(v)) {
-    clipboardArray = Field(v, 0);
+    vRecord = Field(v, 0);
+    clipboardArray = Field(vRecord, 0);
+    vBlockType = Int_val(Field(vRecord, 1));
+
+    if (vBlockType == 0) {
+      *blockType = MLINE;
+    } else {
+      *blockType = MCHAR;
+    }
+
     int len = Wosize_val(clipboardArray);
 
     *num_lines = len;

src/Types.re

@@ -2,10 +2,12 @@ open EditorCoreTypes;
 open Vim;
 open TestFramework;
 
+open Types;
+
 let resetBuffer = () => Helpers.resetBuffer("test/testfile.txt");
 let input = s => ignore(Vim.input(s));
 
-let makeFun = (s, _) => Some([|s|]);
+let makeFun = (s, _) => Some({lines: [|s|], blockType: Line});
 
 describe("Clipboard", ({describe, _}) => {
   describe("override", ({test, _}) => {
@@ -26,7 +28,7 @@ describe("Clipboard", ({describe, _}) => {
     test("return single line", ({expect, _}) => {
       let buf = resetBuffer();
 
-      Clipboard.setProvider(_ => Some([|"a"|]));
+      Clipboard.setProvider(_ => Some({lines: [|"a"|], blockType: Line}));
 
       input("y");
       input("y");
@@ -37,10 +39,46 @@ describe("Clipboard", ({describe, _}) => {
       expect.string(line).toEqual("a");
     });
 
+    test("return single line, blockType character", ({expect, _}) => {
+      let buf = resetBuffer();
+
+      Clipboard.setProvider(_ =>
+        Some({lines: [|"a"|], blockType: Character})
+      );
+
+      input("y");
+      input("y");
+      input("p");
+
+      let line = Buffer.getLine(buf, Index.zero);
+
+      expect.string(line).toEqual("Tahis is the first line of a test file");
+    });
+
+    test("return multiple lines, blockType character", ({expect, _}) => {
+      let buf = resetBuffer();
+
+      Clipboard.setProvider(_ =>
+        Some({lines: [|"a", "b"|], blockType: Character})
+      );
+
+      input("y");
+      input("y");
+      input("p");
+
+      let line0 = Buffer.getLine(buf, Index.zero);
+      let line1 = Buffer.getLine(buf, Index.(zero + 1));
+
+      expect.string(line0).toEqual("Ta");
+      expect.string(line1).toEqual("bhis is the first line of a test file");
+    });
+
     test("return multiple lines", ({expect, _}) => {
       let buf = resetBuffer();
 
-      Clipboard.setProvider(_ => Some([|"a", "b", "c"|]));
+      Clipboard.setProvider(_ =>
+        Some({lines: [|"a", "b", "c"|], blockType: Line})
+      );
 
       input("y");
       input("y");