Merge pull request #439 from skanehira/main

Add `g:fern#window_selector_use_popup` to use popup/float window when select window.

Author: lambdalisue

autoload/fern.vim

@@ -42,6 +42,7 @@ call s:Config.config(expand('<sfile>:p'), {
       \ 'drawer_keep': v:false,
       \ 'drawer_hover_popup_delay': 0,
       \ 'mark_symbol': '*',
+      \ 'window_selector_use_popup': 0,
       \})
 
 function! fern#version() abort

autoload/fern/internal/window.vim

@@ -29,6 +29,7 @@ function! fern#internal#window#select() abort
         \ 'statusline_hl': 'FernWindowSelectStatusLine',
         \ 'indicator_hl': 'FernWindowSelectIndicator',
         \ 'use_winbar': g:fern#internal#window#use_winbar,
+        \ 'use_popup': g:fern#window_selector_use_popup,
         \})
 endfunction
 

autoload/vital/_fern/App/WindowSelector.vim

@@ -15,6 +15,8 @@ function! s:select(winnrs, ...) abort
         \ 'indicator_hl': 'VitalWindowSelectorIndicator',
         \ 'winbar_hl': 'VitalWindowSelectorWinBar',
         \ 'use_winbar': &laststatus is# 3 && exists('&winbar'),
+        \ 'use_popup': 0,
+        \ 'popup_borderchars': ['╭', '─', '╮', '│', '╯', '─', '╰', '│'],
         \}, a:0 ? a:1 : {})
   if !options.use_winbar && &laststatus is# 3
     echohl WarningMsg
@@ -25,26 +27,40 @@ function! s:select(winnrs, ...) abort
     call win_gotoid(len(a:winnrs) ? win_getid(a:winnrs[0]) : win_getid())
     return 0
   endif
-  let target = options.use_winbar ? '&winbar' : '&statusline'
   let length = len(a:winnrs)
-  let store = {}
-  for winnr in a:winnrs
-    let store[winnr] = getwinvar(winnr, target)
-  endfor
   try
     let scs = options.select_chars
     let chars = map(
           \ range(length + 1),
           \ { _, v -> get(scs, v, string(v)) },
           \)
-    let l:S = funcref('s:_statusline', [
-          \ options.use_winbar
-          \   ? options.winbar_hl
-          \   : options.statusline_hl,
-          \ options.indicator_hl,
-          \])
-    call map(keys(store), { k, v -> setwinvar(v, target, S(v, chars[k])) })
-    redrawstatus
+
+    if options.use_popup
+      if len(options.popup_borderchars) != 8
+        echohl WarningMsg
+        echomsg 'vital: App.WindowSelector: number of popup_borderchars must be eight'
+        echohl None
+        return
+      endif
+
+      let borderchars = s:_normalize_popup_borderchars(options.popup_borderchars)
+      call s:_popup(a:winnrs, options.select_chars, borderchars)
+      redraw
+    else
+      let target = options.use_winbar ? '&winbar' : '&statusline'
+      let store = {}
+      for winnr in a:winnrs
+        let store[winnr] = getwinvar(winnr, target)
+      endfor
+      let l:S = funcref('s:_statusline', [
+            \ options.use_winbar
+            \   ? options.winbar_hl
+            \   : options.statusline_hl,
+            \ options.indicator_hl,
+            \])
+      call map(keys(store), { k, v -> setwinvar(v, target, S(v, chars[k])) })
+      redrawstatus
+    endif
     call s:_cnoremap_all(chars)
     let n = input('choose window: ')
     call s:_cunmap_all()
@@ -58,11 +74,98 @@ function! s:select(winnrs, ...) abort
     endif
     call win_gotoid(win_getid(a:winnrs[n]))
   finally
-    call map(keys(store), { _, v -> setwinvar(v, target, store[v]) })
-    redrawstatus
+    if options.use_popup
+      call s:_clear_popups()
+    else
+      call map(keys(store), { _, v -> setwinvar(v, target, store[v]) })
+      redrawstatus
+    endif
   endtry
 endfunction
 
+" Convert popup window border character order to float window border character order
+function! s:_normalize_popup_borderchars(chars) abort
+  if has('nvim')
+    return a:chars
+  endif
+
+  let borderchars = repeat([''], 8)
+  " this is index for convert to float window border characters
+  let idx = [4, 0, 5, 3, 6, 2, 7, 1]
+  for i in range(len(idx))
+    let borderchars[idx[i]] = a:chars[i]
+  endfor
+  return borderchars
+endfunction
+
+let s:_popup_winids = []
+
+if has('nvim')
+  function! s:_clear_popups() abort
+    for winid in s:_popup_winids
+      call nvim_win_close(winid, 1)
+    endfor
+    let s:_popup_winids = []
+  endfunction
+
+  function! s:_popup(winnrs, chars, borderchars) abort
+    for idx in range(len(a:winnrs))
+      let winnr = a:winnrs[idx]
+      let char = a:chars[idx]
+      let text = printf(' %s ', char)
+      let [col, row] = [(winwidth(winnr) - len(text))/2, (winheight(winnr) - 3)/2]
+
+      let bufnr = nvim_create_buf(0, 1)
+      call nvim_buf_set_lines(bufnr, 0, -1, 1, [text])
+
+      let opt = {
+            \ 'relative': 'win',
+            \ 'win': win_getid(winnr),
+            \ 'width': len(text),
+            \ 'height': 1,
+            \ 'col': col,
+            \ 'row': row,
+            \ 'anchor': 'NE',
+            \ 'style': 'minimal',
+            \ 'focusable': 0,
+            \ 'border': map(copy(a:borderchars), { _, v -> [v, 'NormalFloat'] }),
+            \ }
+      let winid = nvim_open_win(bufnr, 1, opt)
+      call add(s:_popup_winids, winid)
+    endfor
+  endfunction
+
+else
+  function! s:_clear_popups() abort
+    for winid in s:_popup_winids
+      call popup_close(winid)
+    endfor
+    let s:_popup_winids = []
+  endfunction
+
+  function! s:_popup(winnrs, chars, borderchars) abort
+    for idx in range(len(a:winnrs))
+      let winnr = a:winnrs[idx]
+      let char = a:chars[idx]
+      let text = printf(' %s ', char)
+
+      let [width, height] = [(winwidth(winnr) - len(text))/2, (winheight(winnr) - 3)/2]
+      let [winrow, wincol] = win_screenpos(winnr)
+      let row = winrow + height
+      let col = wincol + width
+
+      let winid = popup_create([text], {
+            \ 'col': col,
+            \ 'line': row,
+            \ 'border': [1, 1, 1, 1],
+            \ 'borderchars': copy(a:borderchars),
+            \ }) 
+      call add(s:_popup_winids, winid)
+    endfor
+  endfunction
+
+endif
+
 function! s:_statusline(statusline_hl, indicator_hl, winnr, char) abort
   let width = winwidth(a:winnr) - len(a:winnr . '') - 6
   let leading = repeat(' ', width / 2)
@@ -93,7 +196,6 @@ function! s:_cunmap_all() abort
   endfor
 endfunction
 
-
 function! s:_highlight() abort
   highlight default link VitalWindowSelectorStatusLine StatusLineNC
   highlight default link VitalWindowSelectorIndicator  DiffText

doc/fern.txt

@@ -562,6 +562,11 @@ VARIABLE						*fern-variable*
 	A |Number| value that specifies whether to synchronize file renames to the buffer
 	Default: 0
 
+*g:fern#window_selector_use_popup*
+	A |Boolean| which use popup/float window to select window.
+	See |fern-glossary-window-selector|
+	Default: 0
+
 -----------------------------------------------------------------------------
 COMMAND							*fern-command*