From 62da10230f7d58ff7367b08c24ec72f14020f9a1 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Mon, 5 Feb 2024 14:36:50 +0900
Subject: [PATCH] Improve check

---
 autoload/ddc/denops.vim |  6 +++---
 denops/ddc/context.ts   |  6 +++---
 denops/ddc/deps.ts      | 15 ++++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/autoload/ddc/denops.vim b/autoload/ddc/denops.vim
index 60d5f56..420d2ae 100644
--- a/autoload/ddc/denops.vim
+++ b/autoload/ddc/denops.vim
@@ -26,11 +26,11 @@ function ddc#denops#_init(opts = {}) abort
 
   " NOTE: ddc.vim must be registered manually.
   if 'g:loaded_denops'->exists() &&
-        \ (denops#server#status() ==# 'preparing' ||
+        \ ('<amatch>'->expand() ==# 'DenopsReady' ||
         \  denops#server#status() ==# 'running')
-    silent! call s:register()
+    call s:register()
   else
-    autocmd ddc User DenopsReady silent! call s:register()
+    autocmd ddc User DenopsReady call s:register()
   endif
 endfunction
 
diff --git a/denops/ddc/context.ts b/denops/ddc/context.ts
index b17f607..fad31fb 100644
--- a/denops/ddc/context.ts
+++ b/denops/ddc/context.ts
@@ -6,6 +6,7 @@ import {
   fn,
   is,
   op,
+  vimOp,
   vars,
 } from "./deps.ts";
 import {
@@ -374,9 +375,8 @@ async function cacheWorld(denops: Denops, event: DdcEvent): Promise<World> {
     _call(denops, "eskk#is_enabled", false),
     _call(denops, "skkeleton#is_enabled", false),
     op.iminsert.getLocal(denops),
-    // NOTE: op.paste does not work in denops_std@v6.0.0
-    //op.paste.get(denops),
-    denops.call("eval", "&paste") as Promise<boolean>,
+    // NOTE: op.paste is deprecated in neovim
+    vimOp.paste.get(denops),
     fn.line(denops, "."),
     fn.wildmenumode(denops) as Promise<number>,
   ]);
diff --git a/denops/ddc/deps.ts b/denops/ddc/deps.ts
index 1c72c00..3c73df4 100644
--- a/denops/ddc/deps.ts
+++ b/denops/ddc/deps.ts
@@ -1,16 +1,17 @@
-export type { Denops } from "https://deno.land/x/denops_std@v6.0.0/mod.ts";
+export type { Denops } from "https://deno.land/x/denops_std@v6.0.1/mod.ts";
 export {
   echo,
   execute,
-} from "https://deno.land/x/denops_std@v6.0.0/helper/mod.ts";
+} from "https://deno.land/x/denops_std@v6.0.1/helper/mod.ts";
 export {
   batch,
   collect,
-} from "https://deno.land/x/denops_std@v6.0.0/batch/mod.ts";
-export * as op from "https://deno.land/x/denops_std@v6.0.0/option/mod.ts";
-export * as fn from "https://deno.land/x/denops_std@v6.0.0/function/mod.ts";
-export * as vars from "https://deno.land/x/denops_std@v6.0.0/variable/mod.ts";
-export * as autocmd from "https://deno.land/x/denops_std@v6.0.0/autocmd/mod.ts";
+} from "https://deno.land/x/denops_std@v6.0.1/batch/mod.ts";
+export * as op from "https://deno.land/x/denops_std@v6.0.1/option/mod.ts";
+export * as vimOp from "https://deno.land/x/denops_std@v6.0.1/option/vim/mod.ts";
+export * as fn from "https://deno.land/x/denops_std@v6.0.1/function/mod.ts";
+export * as vars from "https://deno.land/x/denops_std@v6.0.1/variable/mod.ts";
+export * as autocmd from "https://deno.land/x/denops_std@v6.0.1/autocmd/mod.ts";
 export * as base64 from "https://deno.land/std@0.214.0/encoding/base64.ts";
 export {
   assertEquals,