integration: Add snippet view function back

Partial revert f5916bd

Author: SilverRainZ

sphinxnotes/snippet/cli.py

@@ -93,7 +93,8 @@ def main(argv:List[str]=sys.argv[1:]) -> int:
     igparser.add_argument('--zsh', '-z', action='store_true', help='dump zsh integration script')
     igparser.add_argument('--zsh-binding', action='store_true', help='dump recommended zsh key binding')
     igparser.add_argument('--vim', '-v', action='store_true', help='dump (neo)vim integration script')
-    igparser.add_argument('--vim-binding', action='store_true', help='dump recommended (neo)vim key binding')
+    igparser.add_argument('--vim-binding', action='store_true', help='dump recommended vim key binding')
+    igparser.add_argument('--nvim-binding', action='store_true', help='dump recommended neovim key binding')
     igparser.set_defaults(func=_on_command_integration, parser=igparser)
 
     # Parse command line arguments
@@ -191,7 +192,12 @@ def _on_command_integration(args:argparse.Namespace):
     if args.vim_binding:
         with open(get_integration_file('binding.vim'), 'r') as f:
             print(f.read())
-
+    if args.nvim_binding:
+        # NeoVim binding depends on Vim binding
+        with open(get_integration_file('binding.vim'), 'r') as f:
+            print(f.read())
+        with open(get_integration_file('binding.nvim'), 'r') as f:
+            print(f.read())
 
 if __name__ == '__main__':
     sys.exit(main())

sphinxnotes/snippet/integration/binding.nvim

@@ -0,0 +1,54 @@
+" NeoVim key binding for sphinxnotes-snippet
+" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"
+" :Author: Shengyu Zhang
+" :Date: 2021-11-14
+" :Version: 20211114
+"
+" TODO: Support vim?
+
+function! g:SphinxNotesSnippetListAndView()
+  function! s:CallView(selection)
+    call g:SphinxNotesSnippetView(s:SplitID(a:selection))
+  endfunction
+  call g:SphinxNotesSnippetList(function('s:CallView'), 'ds')
+endfunction
+
+" https://github.com/anhmv/vim-float-window/blob/master/plugin/float-window.vim
+function! g:SphinxNotesSnippetView(id)
+  let height = float2nr((&lines - 2) / 1.5)
+  let row = float2nr((&lines - height) / 2)
+  let width = float2nr(&columns / 1.5)
+  let col = float2nr((&columns - width) / 2)
+
+  " Main Window
+  let opts = {
+    \ 'relative': 'editor',
+    \ 'style': 'minimal',
+    \ 'width': width,
+    \ 'height': height,
+    \ 'col': col,
+    \ 'row': row,
+    \ }
+
+  let buf = nvim_create_buf(v:false, v:true)
+  " Global for :call
+  let g:sphinx_notes_snippet_win = nvim_open_win(buf, v:true, opts)
+
+  " The content is always reStructuredText for now
+  set filetype=rst
+  " Press enter to return
+  nmap <buffer> <CR> :call nvim_win_close(g:sphinx_notes_snippet_win, v:true)<CR>
+
+  let cmd = [s:snippet, 'get', '--text', a:id]
+  call append(line('$'), ['.. hint:: Press <ENTER> to return'])
+  execute '$read !' . '..'
+  execute '$read !' . join(cmd, ' ')
+  execute '$read !' . '..'
+  call append(line('$'), ['.. hint:: Press <ENTER> to return'])
+endfunction
+
+nmap <C-k>v :call g:SphinxNotesSnippetListAndView()<CR>
+
+" vim: set shiftwidth=2:
+" vim: set ft=vim:

sphinxnotes/snippet/integration/binding.sh

@@ -2,10 +2,24 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 # :Author: Shengyu Zhang
-# :Date: 2021-08-114
+# :Date: 2021-08-14
 # :Version: 20211114
-#
-# .. note:: Must source :file:`./plugin.sh` to get `snippet_list` functions.
+
+function snippet_view() {
+  selection=$(snippet_list ds)
+  [ -z "$selection" ] && return
+
+  # Make sure we have $PAGER
+  if [ -z "$PAGER" ]; then
+    if  [ ! -z "$(where less)" ]; then
+      PAGER='less'
+    else
+      PAGER='cat'
+    fi
+  fi
+
+  echo "$SNIPPET get --text $selection | $PAGER"
+}
 
 function snippet_edit() {
   selection=$(snippet_list ds)
@@ -29,6 +43,7 @@ function snippet_sh_bind_wrapper() {
 }
 
 function snippet_sh_do_bind() {
+  bind -x '"\C-kv": snippet_sh_bind_wrapper snippet_view'
   bind -x '"\C-ke": snippet_sh_bind_wrapper snippet_edit'
   bind -x '"\C-ku": snippet_sh_bind_wrapper snippet_url'
 }

sphinxnotes/snippet/integration/binding.vim

@@ -1,10 +1,11 @@
-" NeoVim key binding for sphinxnotes-snippet
-" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+" Vim key binding for sphinxnotes-snippet
+" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "
 " :Author: Shengyu Zhang
 " :Date: 2021-04-12
 " :Version: 20211114
 "
+
 function! g:SphinxNotesSnippetEdit(id)
   let file = system(join([s:snippet, 'get', '--file', a:id, '2>/dev/null'], ' '))
   let line = system(join([s:snippet, 'get', '--line-start', a:id, '2>/dev/null'], ' '))

sphinxnotes/snippet/integration/binding.zsh

@@ -11,6 +11,10 @@ function snippet_z_bind_wrapper() {
   zle redisplay
 }
 
+function snippet_z_view() {
+  snippet_z_bind_wrapper snippet_view
+}
+
 function snippet_z_edit() {
   snippet_z_bind_wrapper snippet_edit
 }
@@ -20,9 +24,11 @@ function snippet_z_url() {
 }
 
 # Define widgets
+zle -N snippet_z_view
 zle -N snippet_z_edit
 zle -N snippet_z_url
 
+bindkey '^kv' snippet_z_view
 bindkey '^ke' snippet_z_edit
 bindkey '^ku' snippet_z_url