Merge pull request #144 from vim-denops/automation/update-dependencies

📦 Update Deno dependencies

Author: lambdalisue

.github/workflows/test.yml

@@ -71,7 +71,7 @@ jobs:
           - vim: "v8.2.3452"
             nvim: "v0.6.0"
     runs-on: ${{ matrix.runner }}
-    timeout-minutes: 5
+    timeout-minutes: 15
     steps:
       - run: git config --global core.autocrlf false
         if: runner.os == 'Windows'

denops_std/anonymous/mod.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 // https://github.com/microsoft/TypeScript/issues/26223#issuecomment-674500430
 export type TupleOf<T, N extends number> = N extends N

denops_std/anonymous/mod_test.ts

@@ -1,8 +1,8 @@
 import {
   assertEquals,
   assertRejects,
-} from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+} from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import * as anonymous from "./mod.ts";
 
 test({

denops_std/argument/flags_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { parseFlags } from "./flags.ts";
 
 Deno.test("parseFlags", () => {

denops_std/argument/mod_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { parse } from "./mod.ts";
 
 Deno.test("parse", () => {

denops_std/argument/opts_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { parseOpts } from "./opts.ts";
 
 Deno.test("parseOpts", () => {

denops_std/autocmd/common.ts

@@ -1,4 +1,4 @@
-import { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import { AutocmdEvent } from "./types.ts";
 
 type CommonOptions = {

denops_std/autocmd/common_test.ts

@@ -1,5 +1,5 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import { globals } from "../variable/mod.ts";
 import { define, emit, emitAll, list, remove } from "./common.ts";
 

denops_std/autocmd/group.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import { execute } from "../helper/execute.ts";
 import { AutocmdEvent } from "./types.ts";
 import {

denops_std/autocmd/group_test.ts

@@ -1,5 +1,5 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import { globals } from "../variable/mod.ts";
 import { group } from "./group.ts";
 

denops_std/batch/README.md

@@ -94,6 +94,11 @@ export async function main(denops: Denops): Promise<void> {
 }
 ```
 
+Note that `denops.redraw()` is executed only once after the batch is actually
+executed, no matter how many times it is called in the `batch()`. If the `force`
+option is specified even once, the last call will be the one with the force
+option specified.
+
 ### gather
 
 Use `gather()` to call multiple denops functions sequentially without overhead
@@ -138,3 +143,6 @@ export async function main(denops: Denops): Promise<void> {
 The `denops` instance passed to the `gather` block is NOT available outside of
 the block. An error is thrown when `denops.call()`, `denops.cmd()`, or
 `denops.eval()` is called.
+
+Note that `denops.redraw()` cannot be called within `gather()`. If it is called,
+an error is raised.

denops_std/batch/batch.ts

@@ -3,11 +3,14 @@ import type {
   Denops,
   Dispatcher,
   Meta,
-} from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+} from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
+
+type Redraw = undefined | boolean;
 
 class BatchHelper implements Denops {
   #denops: Denops;
   #calls: [string, ...unknown[]][];
+  #redraw: Redraw;
   #closed: boolean;
 
   constructor(denops: Denops) {
@@ -20,6 +23,10 @@ class BatchHelper implements Denops {
     return helper.#calls;
   }
 
+  static getRedraw(helper: BatchHelper): Redraw {
+    return helper.#redraw;
+  }
+
   static close(helper: BatchHelper): void {
     helper.#closed = true;
   }
@@ -44,6 +51,12 @@ class BatchHelper implements Denops {
     this.#denops.dispatcher = dispatcher;
   }
 
+  redraw(force?: boolean): Promise<void> {
+    // Prefer 'force' if the method is called multiple times
+    this.#redraw = !!this.#redraw || !!force;
+    return Promise.resolve();
+  }
+
   call(fn: string, ...args: unknown[]): Promise<unknown> {
     if (this.#closed) {
       return this.#denops.call(fn, ...args);
@@ -96,6 +109,10 @@ export async function batch(
   }
   const calls = BatchHelper.getCalls(helper);
   await denops.batch(...calls);
+  const redraw = BatchHelper.getRedraw(helper);
+  if (redraw != null) {
+    await denops.redraw(redraw);
+  }
 }
 
 export type { BatchHelper };

denops_std/batch/batch_test.ts

@@ -1,5 +1,10 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import {
+  assertSpyCall,
+  assertSpyCalls,
+  spy,
+} from "https://deno.land/std@0.159.0/testing/mock.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import { batch, BatchHelper } from "./batch.ts";
 
 test({
@@ -161,3 +166,87 @@ test({
     ]);
   },
 });
+test({
+  mode: "any",
+  name:
+    "batch() invokes 'redraw()' only once after the batch is actually executed.",
+  fn: async (denops) => {
+    await denops.cmd("let g:denops_batch_test = []");
+    await denops.cmd(
+      "command! -nargs=1 DenopsBatchTest let g:denops_batch_test += [<f-args>]",
+    );
+    const redrawSpy = spy(denops, "redraw");
+    try {
+      await batch(denops, async (denops) => {
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 1"),
+          undefined,
+        );
+        await denops.redraw();
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 2"),
+          undefined,
+        );
+        await denops.redraw();
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 3"),
+          undefined,
+        );
+        await denops.redraw();
+      });
+    } finally {
+      redrawSpy.restore();
+    }
+    assertEquals(await denops.eval("g:denops_batch_test") as string[], [
+      "1",
+      "2",
+      "3",
+    ]);
+    assertSpyCalls(redrawSpy, 1);
+    assertSpyCall(redrawSpy, 0, {
+      args: [false],
+    });
+  },
+});
+test({
+  mode: "any",
+  name:
+    "batch() invokes 'redraw(true)' only once after the batch is actually executed.",
+  fn: async (denops) => {
+    await denops.cmd("let g:denops_batch_test = []");
+    await denops.cmd(
+      "command! -nargs=1 DenopsBatchTest let g:denops_batch_test += [<f-args>]",
+    );
+    const redrawSpy = spy(denops, "redraw");
+    try {
+      await batch(denops, async (denops) => {
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 1"),
+          undefined,
+        );
+        await denops.redraw();
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 2"),
+          undefined,
+        );
+        await denops.redraw(true);
+        assertEquals(
+          await denops.call("execute", "DenopsBatchTest 3"),
+          undefined,
+        );
+        await denops.redraw();
+      });
+    } finally {
+      redrawSpy.restore();
+    }
+    assertEquals(await denops.eval("g:denops_batch_test") as string[], [
+      "1",
+      "2",
+      "3",
+    ]);
+    assertSpyCalls(redrawSpy, 1);
+    assertSpyCall(redrawSpy, 0, {
+      args: [true],
+    });
+  },
+});

denops_std/batch/gather.ts

@@ -3,7 +3,7 @@ import type {
   Denops,
   Dispatcher,
   Meta,
-} from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+} from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 class GatherHelper implements Denops {
   #denops: Denops;
@@ -44,6 +44,10 @@ class GatherHelper implements Denops {
     this.#denops.dispatcher = dispatcher;
   }
 
+  redraw(_force?: boolean): Promise<void> {
+    throw new Error("The 'redraw' method is not available on GatherHelper.");
+  }
+
   call(fn: string, ...args: unknown[]): Promise<unknown> {
     if (this.#closed) {
       throw new Error(

denops_std/batch/gather_test.ts

@@ -1,8 +1,8 @@
 import {
   assertEquals,
   assertRejects,
-} from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+} from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import { gather, GatherHelper } from "./gather.ts";
 
 test({
@@ -93,3 +93,18 @@ test({
     );
   },
 });
+test({
+  mode: "any",
+  name: "gather() throws an error when 'denops.redraw()' is called.",
+  fn: async (denops) => {
+    await assertRejects(
+      async () => {
+        await gather(denops, async (denops) => {
+          await denops.redraw();
+        });
+      },
+      "method is not available",
+    );
+  },
+  prelude: ["let g:denops#enable_workaround_vim_before_8_2_3081 = 1"],
+});

denops_std/buffer/buffer.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import * as autocmd from "../autocmd/mod.ts";
 import * as batch from "../batch/mod.ts";
 import * as fn from "../function/mod.ts";

denops_std/buffer/buffer_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { test } from "../test/mod.ts";
 import { default as Encoding } from "https://cdn.skypack.dev/encoding-japanese@2.0.0/";
 import * as fn from "../function/mod.ts";

denops_std/buffer/decoration.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import * as batch from "../batch/mod.ts";
 import * as vimFn from "../function/vim/mod.ts";
 import * as nvimFn from "../function/nvim/mod.ts";

denops_std/buffer/fileencoding_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { default as Encoding } from "https://cdn.skypack.dev/encoding-japanese@2.0.0/";
 import { tryDecode } from "./fileencoding.ts";
 

denops_std/buffer/fileformat_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { FileFormat, findFileFormat, splitText } from "./fileformat.ts";
 
 Deno.test("splitText", async (t) => {

denops_std/bufname/bufname_test.ts

@@ -1,8 +1,8 @@
 import {
   assertEquals,
   assertThrows,
-} from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import * as path from "https://deno.land/std@0.151.0/path/mod.ts";
+} from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import * as path from "https://deno.land/std@0.159.0/path/mod.ts";
 import { format, parse } from "./bufname.ts";
 
 Deno.test("format throws exception when 'scheme' contains unusable characters", () => {

denops_std/bufname/utils_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { decode, encode } from "./utils.ts";
 
 Deno.test("encode does nothing on alphabet characters", () => {

denops_std/function/_generated.ts

@@ -1,6 +1,6 @@
 // NOTE: This file is generated. Do NOT modify it manually.
 // deno-lint-ignore-file camelcase
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 /**
  * Return the absolute value of {expr}.  When {expr} evaluates to

denops_std/function/buffer.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 /**
  * Add a buffer to the buffer list with {name}.

denops_std/function/common.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 /**
  * The result is a Number, which is |TRUE| if {expr} is

denops_std/function/cursor.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import type { Position, ScreenPos } from "./types.ts";
 
 /**

denops_std/function/cursor_test.ts

@@ -1,6 +1,6 @@
-import { assertEquals } from "https://deno.land/std@0.151.0/testing/asserts.ts";
+import { assertEquals } from "https://deno.land/std@0.159.0/testing/asserts.ts";
 import { assertNumber } from "https://deno.land/x/unknownutil@v2.0.0/mod.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import * as cursor from "./cursor.ts";
 import { assertPosition, assertScreenPos, isScreenPos } from "./types.ts";
 

denops_std/function/input.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 import { BuiltinCompletion, isValidBuiltinCompletion } from "./types.ts";
 
 /**

denops_std/function/input_test.ts

@@ -1,8 +1,8 @@
 import {
   assertEquals,
   assertRejects,
-} from "https://deno.land/std@0.151.0/testing/asserts.ts";
-import { test } from "https://deno.land/x/denops_core@v3.1.0/test/mod.ts";
+} from "https://deno.land/std@0.159.0/testing/asserts.ts";
+import { test } from "https://deno.land/x/denops_core@v3.2.0/test/mod.ts";
 import { input, inputlist, inputsecret } from "./input.ts";
 import * as autocmd from "../autocmd/mod.ts";
 import { execute } from "../helper/execute.ts";

denops_std/function/nvim/_generated.ts

@@ -1,6 +1,6 @@
 // NOTE: This file is generated. Do NOT modify it manually.
 // deno-lint-ignore-file camelcase
-import type { Denops } from "https://deno.land/x/denops_core@v3.1.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_core@v3.2.0/mod.ts";
 
 /**
  * Returns Dictionary of |api-metadata|.