Merge pull request #463 from liquidz/next_release

Next release
liquidz · Jun 24, 2023 · 03a6c65 · 03a6c65
2 parents 9eaa2b5 + 46eba1f
commit 03a6c65
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,6 +1,15 @@
 All notable changes to this project will be documented in this file. This change log follows the conventions of http://keepachangelog.com/[keepachangelog.com].
 
 == Unreleased (dev)
+// {{{
+=== Changed
+* Bumped cider-nrepl to 0.31.0.
+* Updated zprint installer to 1.2.7.
+
+=== Fixed
+* Fixed auto documentation not to work when popup menu is visible.
+** Added `g:iced#util#pumvisible_fn` option.
+// }}}
 
 == 3.14.3225 (2023-05-08)
 // {{{

diff --git a/autoload/iced/nrepl/auto.vim b/autoload/iced/nrepl/auto.vim
@@ -62,11 +62,13 @@ function! iced#nrepl#auto#enable_bufenter(bool) abort
 endfunction
 
 function! iced#nrepl#auto#cursor_moved() abort
-  let timer = iced#system#get('timer')
-  call timer.start_lazily(
-        \ 'document_current_form',
-        \ g:iced#nrepl#auto#document_delay,
-        \ {-> iced#nrepl#document#current_form()})
+  if ! iced#util#pumvisible()
+    let timer = iced#system#get('timer')
+    call timer.start_lazily(
+          \ 'document_current_form',
+          \ g:iced#nrepl#auto#document_delay,
+          \ {-> iced#nrepl#document#current_form()})
+  endif
 endfunction
 
 let &cpoptions = s:save_cpo

diff --git a/autoload/iced/util.vim b/autoload/iced/util.vim
@@ -4,6 +4,8 @@ set cpoptions&vim
 
 let g:iced#debug = get(g:, 'iced#debug', v:false)
 
+let g:iced#util#pumvisible_fn = get(g:, 'iced#util#pumvisible_fn', function('pumvisible'))
+
 function! iced#util#wait(pred, timeout_ms) abort
   if a:timeout_ms == -1
     " wait forever
@@ -260,5 +262,9 @@ function! iced#util#add_curpos_to_jumplist() abort
   silent normal! m'
 endfunction
 
+function! iced#util#pumvisible() abort
+  return g:iced#util#pumvisible_fn()
+endfunction
+
 let &cpoptions = s:save_cpo
 unlet s:save_cpo
diff --git a/bin/iced b/bin/iced
@@ -9,7 +9,7 @@ SCRIPT_DIR=$(cd $(dirname $0); pwd)
 PROJECT_DIR=$(cd $SCRIPT_DIR; cd ..; pwd)
 VERSION=$(grep 'Version: ' ${SCRIPT_DIR}/../doc/vim-iced.txt | cut -d' ' -f2)
 
-BASE_DEPENDENCIES='nrepl/nrepl:1.0.0 refactor-nrepl/refactor-nrepl:3.6.0 cider/cider-nrepl:0.30.0 com.github.liquidz/iced-nrepl:1.2.480'
+BASE_DEPENDENCIES='nrepl/nrepl:1.0.0 refactor-nrepl/refactor-nrepl:3.6.0 cider/cider-nrepl:0.31.0 com.github.liquidz/iced-nrepl:1.2.480'
 BASE_MIDDLEWARES='cider.nrepl/wrap-classpath cider.nrepl/wrap-clojuredocs cider.nrepl/wrap-complete cider.nrepl/wrap-debug cider.nrepl/wrap-format cider.nrepl/wrap-info cider.nrepl/wrap-macroexpand cider.nrepl/wrap-ns cider.nrepl/wrap-out cider.nrepl/wrap-refresh cider.nrepl/wrap-stacktrace cider.nrepl/wrap-spec cider.nrepl/wrap-test cider.nrepl/wrap-trace cider.nrepl/wrap-undef cider.nrepl/wrap-xref refactor-nrepl.middleware/wrap-refactor iced.nrepl/wrap-iced'
 
 CLJS_DEPENDENCIES='cider/piggieback:0.5.3'

diff --git a/deps.edn b/deps.edn
@@ -1,7 +1,7 @@
 {:paths ["clj/repl"]
  :deps {nrepl/nrepl {:mvn/version "1.0.0"}
         refactor-nrepl/refactor-nrepl {:mvn/version "3.6.0"}
-        cider/cider-nrepl {:mvn/version "0.30.0"}
+        cider/cider-nrepl {:mvn/version "0.31.0"}
         com.github.liquidz/iced-nrepl {:mvn/version "1.2.480"}}
  :__middlewares__
  ["cider.nrepl/wrap-classpath"

diff --git a/doc/vim-iced.txt b/doc/vim-iced.txt
@@ -144,7 +144,7 @@ LEININGEN~
   {:user
    {:dependencies [[nrepl "1.0.0"]
                    [com.github.liquidz/iced-nrepl "1.2.480"]
-                   [cider/cider-nrepl "0.30.0"]]
+                   [cider/cider-nrepl "0.31.0"]]
     :repl-options {:nrepl-middleware [cider.nrepl/wrap-classpath
                                       cider.nrepl/wrap-clojuredocs
                                       cider.nrepl/wrap-complete
@@ -174,7 +174,7 @@ BOOT~
 
   (swap! boot.repl/*default-dependencies* concat
     '[[refactor-nrepl "3.6.0"]
-      [cider/cider-nrepl "0.30.0"]
+      [cider/cider-nrepl "0.31.0"]
       [com.github.liquidz/iced-nrepl "1.2.480"]])
 
   (swap! boot.repl/*default-middleware* concat
@@ -204,7 +204,7 @@ SHADOW-CLJS~
 >
   {
    :dependencies [[refactor-nrepl "3.6.0"]
-                  [cider/cider-nrepl "0.30.0"]
+                  [cider/cider-nrepl "0.31.0"]
                   [com.github.liquidz/iced-nrepl "1.2.480"]]
   }
 <
@@ -2491,6 +2491,7 @@ AUTO DOCUMENT~
 g:iced_enable_auto_document
   Enable automatic displaying one-line document.
   This will be done by |CursorMoved| / |CursorMovedI| auto command and |timer|.
+  NOTE: This feature won't work when popup menu is visible.
 
   The value should be one of `'normal'`, `'insert'` or `'any'`.
   Otherwise, this option will be disabled.
@@ -2503,6 +2504,7 @@ g:iced_enable_auto_document
   See also:
   - |g:iced_enable_popup_document|
   - |g:iced#nrepl#auto#document_delay|
+  - |g:iced#util#pumvisible_fn|
 
                                                  *g:iced_enable_popup_document*
 g:iced_enable_popup_document
@@ -2530,6 +2532,11 @@ g:iced#nrepl#auto#document_delay
   Unit is milli sec.
   Default value is `500`.
 
+                                                    *g:iced#util#pumvisible_fn*
+g:iced#util#pumvisible_fn
+  The function to check whether popup menu is visible or not.
+  Default value is `function('pumvisible')`.
+
 ------------------------------------------------------------------------------
 AUTO INDENT                                  *vim-iced-customizing-auto-indent*
 

diff --git a/installer/zprint-clj.sh b/installer/zprint-clj.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-version='1.2.5'
+version='1.2.7'
 # NOTE: macOS has a same named command, so add '-clj' postfix
 file='zprint-clj'
 if [ "$(uname)" == 'Darwin' ]; then