Merge pull request #455 from liquidz/next_release

Next release
liquidz · Feb 3, 2023 · 02eb7fd · 02eb7fd
2 parents 642c92e + c549878
commit 02eb7fd
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 12 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,6 +1,17 @@
 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
+* Changed default popup border for Neovim.
+* Bumped cider-nrepl to 0.30.0.
+* Bumped jet to 0.4.23.
+* Bumped zprint to 1.2.5.
+
+=== Fixed
+* Fixed not to show auto documents for empty docstrings.
+* Fixed popup closing functionality to use `nvim_win_close` for Neovim.
+// }}}
 
 == 3.14.3196 (2022-12-28)
 // {{{

diff --git a/README.adoc b/README.adoc
@@ -171,6 +171,6 @@ and https://github.com/liquidz/iced-nrepl[iced-nrepl].
 
 == License
 
-Copyright (c) 2018-2022 http://twitter.com/uochan[Masashi Iizuka]
+Copyright (c) 2018-2023 http://twitter.com/uochan[Masashi Iizuka]
 
 Distributed under the MIT License.
diff --git a/autoload/iced/component/popup/neovim.vim b/autoload/iced/component/popup/neovim.vim
@@ -2,7 +2,7 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 
 let s:default_filetype = 'clojure'
-let s:default_border = [' ', '=' , ' ', ' ', ' ', '=', ' ', ' ']
+let s:default_border = 'double'
 let s:last_winid = -1
 
 let s:popup = {
@@ -248,9 +248,11 @@ endfunction
 
 function! s:popup.close(window_id) abort
   if !s:is_supported() | return | endif
-  if win_gotoid(a:window_id)
-    silent execute ':q'
-  endif
+  try
+    call nvim_win_close(a:window_id, 0)
+  catch
+  endtry
+
   let s:last_winid = -1
 endfunction
 

diff --git a/autoload/iced/nrepl/document.vim b/autoload/iced/nrepl/document.vim
@@ -222,6 +222,11 @@ function! s:one_line_doc(resp) abort
     if popup.is_supported()
           \ && s:enable_popup_one_line_document
       let popup_args = trim(get(a:resp, 'arglists-str', ''))
+      if empty(popup_args)
+        call iced#nrepl#document#close()
+        return
+      endif
+
       let popup_args = substitute(popup_args, '\r\?\n', " \n ", 'g')
       let popup_args = printf(' %s ', popup_args)
       let popup_args = split(popup_args, '\n')

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.29.0 com.github.liquidz/iced-nrepl:1.2.474'
+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.474'
 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.29.0"}
+        cider/cider-nrepl {:mvn/version "0.30.0"}
         com.github.liquidz/iced-nrepl {:mvn/version "1.2.474"}}
  :__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.474"]
-                   [cider/cider-nrepl "0.29.0"]]
+                   [cider/cider-nrepl "0.30.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.29.0"]
+      [cider/cider-nrepl "0.30.0"]
       [com.github.liquidz/iced-nrepl "1.2.474"]])
 
   (swap! boot.repl/*default-middleware* concat
@@ -204,7 +204,7 @@ SHADOW-CLJS~
 >
   {
    :dependencies [[refactor-nrepl "3.6.0"]
-                  [cider/cider-nrepl "0.29.0"]
+                  [cider/cider-nrepl "0.30.0"]
                   [com.github.liquidz/iced-nrepl "1.2.474"]]
   }
 <

diff --git a/installer/jet.sh b/installer/jet.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-version='0.3.21'
+version='0.4.23'
 file='jet.tar.gz'
 if [ "$(uname)" == 'Darwin' ]; then
     os='macos'

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