🐛 Fix decorate and undecorate in Vim

Without `id`, `undecorate` remove all decorations even if `start` and
`end` are specified.

Author: lambdalisue

buffer/decoration.ts

@@ -178,8 +178,9 @@ async function vimDecorate(
       });
       rs.add(highlight);
     }
+    let id = 1;
     for (const [type, props] of decoMap.entries()) {
-      await vimFn.prop_add_list(denops, { bufnr, type }, [...props]);
+      await vimFn.prop_add_list(denops, { bufnr, type, id: id++ }, [...props]);
     }
   });
 }
@@ -193,7 +194,7 @@ async function vimUndecorate(
   const propList = await vimFn.prop_list(denops, start + 1, {
     bufnr,
     end_lnum: end,
-  }) as { id: string; type: string }[];
+  }) as { id: number; type: string }[];
   const propIds = new Set(
     propList
       .filter((p) => p.type.startsWith(`${prefix}:`))

buffer/decoration_test.ts

@@ -1,4 +1,5 @@
 import { assertEquals } from "@std/assert";
+import { omit } from "@std/collections";
 import { test } from "@denops/test";
 import * as fn from "../function/mod.ts";
 import * as vimFn from "../function/vim/mod.ts";
@@ -24,7 +25,7 @@ test({
         type: string;
         type_bufnr: number;
       }[];
-      return props;
+      return props.map((prop) => omit(prop, ["id"]));
     };
     const bufnr = await fn.bufnr(denops);
     await buffer.replace(denops, bufnr, [
@@ -50,7 +51,6 @@ test({
     assertEquals(await collect(bufnr), [{
       col: 1,
       end: 1,
-      id: 0,
       length: 5,
       lnum: 1,
       start: 1,
@@ -59,13 +59,28 @@ test({
     }, {
       col: 2,
       end: 1,
-      id: 0,
       length: 3,
       lnum: 2,
       start: 1,
       type: "denops_std:buffer:decoration:decorate:Search",
       type_bufnr: 0,
     }]);
+
+    // Re-appling the same decorations is OK
+    await decorate(denops, bufnr, [
+      {
+        line: 1,
+        column: 1,
+        length: 5,
+        highlight: "Title",
+      },
+      {
+        line: 2,
+        column: 2,
+        length: 3,
+        highlight: "Search",
+      },
+    ]);
   },
 });
 

deno.jsonc

@@ -54,6 +54,7 @@
     "@lambdalisue/unreachable": "jsr:@lambdalisue/unreachable@^1.0.1",
     "@nick/dispose": "jsr:@nick/dispose@^1.1.0",
     "@std/assert": "jsr:@std/assert@^1.0.0",
+    "@std/collections": "jsr:@std/collections@^1.0.9",
     "@std/fs": "jsr:@std/fs@^1.0.0",
     "@std/path": "jsr:@std/path@^1.0.2",
     "@std/semver": "jsr:@std/semver@^1.0.0",
@@ -69,8 +70,8 @@
     "jsr:@denops/std/bufname": "./bufname/mod.ts",
     "jsr:@denops/std/eval": "./eval/mod.ts",
     "jsr:@denops/std/eval/expression": "./eval/expression.ts",
-    "jsr:@denops/std/eval/stringify": "./eval/stringify.ts",
     "jsr:@denops/std/eval/string": "./eval/string.ts",
+    "jsr:@denops/std/eval/stringify": "./eval/stringify.ts",
     "jsr:@denops/std/eval/use-eval": "./eval/use_eval.ts",
     "jsr:@denops/std/function": "./function/mod.ts",
     "jsr:@denops/std/function/nvim": "./function/nvim/mod.ts",