Merge pull request #392 from liquidz/dev [skip ci]

3.8.3
liquidz · Mar 19, 2022 · faec513 · faec513
2 parents 338395b + c55e1a3
commit faec513
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 11 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,5 +15,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: DeLaGuardo/setup-clj-kondo@master
         with:
-          version: '2022.03.04'
+          version: '2022.03.09'
       - run: clj-kondo --parallel --lint clj:test/clj --config '{:output {:pattern "::{{level}} file={{filename}},line={{row}},col={{col}}::{{message}}"}}'
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. This change
 
 == Unreleased (dev)
 
+== 3.8.3 (2022-03-20)
+// {{{
+=== Added
+* https://github.com/liquidz/vim-iced/issues/389[#389]: Added `g:iced#eval#popup_highlight` option to change the highlight setting for popup to display evaluated result.
+** https://liquidz.github.io/vim-iced/vim-iced.html#g%3Aiced%23eval%23popup_highlight
+
+=== Changed
+* https://github.com/liquidz/vim-iced/pull/391[#391]: Added document for disabling paredit.
+** https://liquidz.github.io/vim-iced/#_disabling_paredit
+* Bumped refactor-nrepl to 3.5.2.
+// }}}
+
 == 3.8.2 (2022-03-06)
 // {{{
 === Changed

diff --git a/autoload/iced/nrepl/eval.vim b/autoload/iced/nrepl/eval.vim
@@ -54,7 +54,7 @@ function! iced#nrepl#eval#out(resp, ...) abort
       endif
 
       let virtual_text_opt = copy(get(opt, 'virtual_text', {}))
-      let virtual_text_opt['highlight'] = 'Comment'
+      let virtual_text_opt['highlight'] = g:iced#eval#popup_highlight
       if g:iced#eval#keep_inline_result
         let virtual_text_opt['auto_clear'] = v:false
       else

diff --git a/autoload/iced/repl.vim b/autoload/iced/repl.vim
@@ -5,6 +5,7 @@ let g:iced#eval#inside_comment = get(g:, 'iced#eval#inside_comment', v:true)
 let g:iced#eval#mark_at_last = get(g:, 'iced#eval#mark_at_last', '1')
 let g:iced#eval#keep_inline_result = get(g:, 'iced#eval#keep_inline_result', v:false)
 let g:iced#eval#values_to_skip_storing_register = get(g:, 'iced#eval#values_to_skip_storing_register', ['nil', 'true', 'false'])
+let g:iced#eval#popup_highlight = get(g:, 'iced#eval#popup_highlight', 'Comment')
 let g:iced#repl#babashka_repl_type = get(g:, 'iced#repl#babashka_repl_type', 'nrepl')
 let g:iced#repl#ignore_connected = get(g:, 'iced#repl#ignore_connected', v:false)
 

diff --git a/autoload/iced/socket_repl.vim b/autoload/iced/socket_repl.vim
@@ -30,7 +30,8 @@ function! s:default_callback(resp) abort
     echo iced#util#shorten(value)
     call iced#system#get('virtual_text').set(
           \ printf('=> %s', value),
-          \ {'highlight': 'Comment', 'auto_clear': v:true})
+          \ {'highlight': g:iced#eval#popup_highlight,
+          \  'auto_clear': v:true})
   endif
 endfunction
 

diff --git a/bin/iced b/bin/iced
@@ -5,7 +5,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:0.9.0 refactor-nrepl/refactor-nrepl:3.4.0 cider/cider-nrepl:0.28.3 com.github.liquidz/iced-nrepl:1.2.8'
+BASE_DEPENDENCIES='nrepl/nrepl:0.9.0 refactor-nrepl/refactor-nrepl:3.5.2 cider/cider-nrepl:0.28.3 com.github.liquidz/iced-nrepl:1.2.8'
 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-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,6 +1,6 @@
 {:paths ["clj/repl"]
  :deps {nrepl/nrepl {:mvn/version "0.9.0"}
-        refactor-nrepl/refactor-nrepl {:mvn/version "3.4.0"}
+        refactor-nrepl/refactor-nrepl {:mvn/version "3.5.2"}
         cider/cider-nrepl {:mvn/version "0.28.3"}
         com.github.liquidz/iced-nrepl {:mvn/version "1.2.8"}}
  :__middlewares__

diff --git a/doc/pages/evaluation.adoc b/doc/pages/evaluation.adoc
@@ -44,10 +44,12 @@ TIP: See also <<eval_inside_comment>>
 === Results [[evaluation_results]]
 
 The evaluation result is echoed on command-line and displayed in a popup at the end of line.
-However, the displayed result is only the returned value, so for example, the contents output by `println` are not diplayed.
+However, the displayed result is only the returned value, so for example, the contents output by `println` are not displayed.
 
 The contents output to standard output are displayed on the <<stdout_buffer>>.
 
+The highlight setting for popup can be modified by {help_html}#g%3Aiced%23eval%23popup_highlight[g:iced#eval#popup_highlight].
+
 === Marks [[evaluation_marks]]
 
 vim-iced also provides ways to evaluate forms by Vim's https://vim-jp.org/vimdoc-en/motion.html#mark-motions[mark].

diff --git a/doc/vim-iced.txt b/doc/vim-iced.txt
@@ -1,6 +1,6 @@
 *vim-iced.txt*      Clojure interactive development environment for Vim8/Neovim
 
-Version: 3.8.2
+Version: 3.8.3
 Author : Masashi Iizuka <[email protected]>
 License: MIT LICENSE
 
@@ -156,7 +156,7 @@ LEININGEN~
                                       cider.nrepl/wrap-undef
                                       cider.nrepl/wrap-xref
                                       iced.nrepl/wrap-iced]}
-    :plugins [[refactor-nrepl "3.4.0"]]}}
+    :plugins [[refactor-nrepl "3.5.2"]]}}
 <
 
                                                          *vim-iced-manual-boot*
@@ -167,7 +167,7 @@ BOOT~
   (require (quote boot.repl))
 
   (swap! boot.repl/*default-dependencies* concat
-    '[[refactor-nrepl "3.4.0"]
+    '[[refactor-nrepl "3.5.2"]
       [cider/cider-nrepl "0.28.3"]
       [com.github.liquidz/iced-nrepl "1.2.8"]])
 
@@ -195,7 +195,7 @@ SHADOW-CLJS~
   shadow-cljs.edn
 >
   {
-   :dependencies [[refactor-nrepl "3.4.0"]
+   :dependencies [[refactor-nrepl "3.5.2"]
                   [cider/cider-nrepl "0.28.3"]
                   [com.github.liquidz/iced-nrepl "1.2.8"]]
   }
@@ -1894,6 +1894,11 @@ g:iced#eval#mark_at_last
 g:iced#eval#values_to_skip_storing_register
   Evaluated values not to store to numbered registers.
   Default value is `['nil', 'true', 'false']`.
+
+                                                  *g:iced#eval#popup_highlight*
+g:iced#eval#popup_highlight
+  The highlight setting for popup to display evaluated result.
+  Default value is `'Comment'`.
 
                                                    *g:iced#buffer#error#height*
 g:iced#buffer#error#height

diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
@@ -2,7 +2,7 @@ if exists('g:loaded_vim_iced')
   finish
 endif
 let g:loaded_vim_iced = 1
-let g:vim_iced_version = 30802
+let g:vim_iced_version = 30803
 let g:vim_iced_home = expand('<sfile>:p:h:h')
 " NOTE: https://github.com/vim/vim/commit/162b71479bd4dcdb3a2ef9198a1444f6f99e6843
 "       Add functions for defining and placing signs.