Merge pull request #78 from vim-denops/fix-echo

🐛 Fix flush on `echo()` function in `helper` module on Vim

Author: lambdalisue

denops_std/helper/echo.ts

@@ -1,8 +1,6 @@
 import { deferred, Denops } from "../deps.ts";
 import * as anonymous from "../anonymous/mod.ts";
-import { execute } from "./execute.ts";
-
-let defined = false;
+import { load } from "./load.ts";
 
 /**
  * Echo message as like `echo` on Vim script.
@@ -26,54 +24,9 @@ export function echo(denops: Denops, message: string): Promise<void> {
 }
 
 async function echoVim(denops: Denops, message: string): Promise<void> {
+  await load(denops, new URL("./echo.vim", import.meta.url));
   const waiter = deferred<void>();
   const id = anonymous.once(denops, () => waiter.resolve())[0];
-  await define(denops);
-  await denops.cmd(
-    `call timer_start(0, { -> s:denops_std_helper_echo(l:message, l:name, l:id) })`,
-    {
-      message,
-      name: denops.name,
-      id,
-    },
-  );
+  await denops.call("DenopsStdHelperEcho", message, denops.name, id);
   await waiter;
 }
-
-async function define(denops: Denops): Promise<void> {
-  if (defined) {
-    return;
-  }
-  await execute(
-    denops,
-    `
-    if exists('s:loaded_denops_std_helper_echo')
-      return
-    endif
-    let s:loaded_denops_std_helper_echo = 1
-    function! s:denops_std_helper_echo(message, name, id) abort
-      let info = {}
-      let info.t = timer_start(0, { -> feedkeys('jk', 'n') })
-      let info.name = a:name
-      let info.id = a:id
-      let info.message = a:message
-      let info.updatetime = &updatetime
-      let &updatetime = 1
-      let s:denops_std_helper_echo_info = info
-      augroup denops_std_helper_echo
-        autocmd!
-        autocmd CursorHold * ++once call s:denops_std_helper_echo_post()
-      augroup END
-    endfunction
-    function! s:denops_std_helper_echo_post() abort
-      let info = s:denops_std_helper_echo_info
-      silent! unlet! s:denops_std_helper_echo_info
-      let &updatetime = info.updatetime
-      call timer_stop(info.t)
-      redraw | echo info.message
-      call denops#request(info.name, info.id, [])
-    endfunction
-    `,
-  );
-  defined = true;
-}

denops_std/helper/echo.vim

@@ -0,0 +1,36 @@
+if exists('g:loaded_denops_std_helper_echo')
+  finish
+endif
+let g:loaded_denops_std_helper_echo = 1
+
+" Redraw debounce interval defined in denops.vim
+" https://github.com/vim-denops/denops.vim/pull/90
+let s:redraw_interval = 10
+
+function! DenopsStdHelperEcho(message, name, id) abort
+  let info = {}
+  let info.name = a:name
+  let info.id = a:id
+  let info.message = a:message
+  let info.updatetime = &updatetime
+  let s:denops_std_helper_echo_info = info
+  " Wait s:redraw_interval + alpha to avoid debounced
+  " `redraw` call after RPC. See #77 for details.
+  " https://github.com/vim-denops/deno-denops-std/issues/77
+  let &updatetime = float2nr(ceil(s:redraw_interval * 1.5))
+  " Reset Vim's internal timer for 'updatetime'
+  call feedkeys('jk', 'n')
+  augroup denops_std_helper_echo
+    autocmd!
+    autocmd CursorHold * ++once call s:denops_std_helper_echo_post()
+  augroup END
+endfunction
+
+function! s:denops_std_helper_echo_post() abort
+  let info = s:denops_std_helper_echo_info
+  silent! unlet! s:denops_std_helper_echo_info
+  let &updatetime = info.updatetime
+  redraw | echo info.message
+  call denops#request(info.name, info.id, [])
+endfunction
+