Merge branch 'main' into v7-pre

Shougo · Jul 27, 2024 · 43a9d96 · 43a9d96
2 parents 890bd19 + fb7eccd
commit 43a9d96
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/denops/ddc/deps.ts b/denops/ddc/deps.ts
@@ -1,17 +1,25 @@
-export type { Denops, Entrypoint } from "jsr:@denops/std@7.0.0-pre1";
-export { echo } from "jsr:@denops/std@7.0.0-pre1/helper/echo";
-export { execute } from "jsr:@denops/std@7.0.0-pre1/helper/execute";
-export { batch, collect } from "jsr:@denops/std@7.0.0-pre1/batch";
-export * as op from "jsr:@denops/std@7.0.0-pre1/option";
-export * as vimOp from "jsr:@denops/std@7.0.0-pre1/option/vim";
-export * as fn from "jsr:@denops/std@7.0.0-pre1/function";
-export * as vars from "jsr:@denops/std@7.0.0-pre1/variable";
-export * as autocmd from "jsr:@denops/std@7.0.0-pre1/autocmd";
+export type {
+  Denops,
+  Entrypoint,
+} from "https://deno.land/x/denops_std@v6.5.1/mod.ts";
+export {
+  echo,
+  execute,
+} from "https://deno.land/x/denops_std@v6.5.1/helper/mod.ts";
+export {
+  batch,
+  collect,
+} from "https://deno.land/x/denops_std@v6.5.1/batch/mod.ts";
+export * as op from "https://deno.land/x/denops_std@v6.5.1/option/mod.ts";
+export * as vimOp from "https://deno.land/x/denops_std@v6.5.1/option/vim/mod.ts";
+export * as fn from "https://deno.land/x/denops_std@v6.5.1/function/mod.ts";
+export * as vars from "https://deno.land/x/denops_std@v6.5.1/variable/mod.ts";
+export * as autocmd from "https://deno.land/x/denops_std@v6.5.1/autocmd/mod.ts";
 
-export * from "jsr:@std/encoding@1.0.0/base64";
-export { assertEquals, equal } from "jsr:@std/assert@0.226.0";
-export { basename, parse, toFileUrl } from "jsr:@std/path@0.225.2";
-export { deadline, DeadlineError } from "jsr:@std/async@0.224.2";
+export * from "jsr:@std/encoding@1.0.1/base64";
+export { assertEquals, equal } from "jsr:@std/assert@1.0.1";
+export { basename, parse, toFileUrl } from "jsr:@std/path@1.0.2";
+export { deadline } from "jsr:@std/async@1.0.1";
 export { spy } from "jsr:@std/testing@0.225.3/mock";
 
 export { ensure, is } from "jsr:@core/unknownutil@3.18.1";

diff --git a/denops/ddc/ext.ts b/denops/ddc/ext.ts
@@ -1,4 +1,4 @@
-import { deadline, DeadlineError, Denops } from "./deps.ts";
+import { deadline, Denops } from "./deps.ts";
 import {
   BaseFilter,
   BaseFilterParams,
@@ -754,7 +754,7 @@ export async function callSourceGather<
   } catch (e: unknown) {
     if (
       isDdcCallbackCancelError(e) ||
-      e instanceof DeadlineError
+      e instanceof DOMException
     ) {
       // Ignore timeout error
     } else {