wip: refile

Author: lervag

autoload/wiki/page.vim

@@ -169,60 +169,27 @@ function! wiki#page#refile(...) abort "{{{1
         \ target_lnum: 0,
         \}, a:0 > 0 ? a:1 : {})
 
-  " Collect source data
-  let l:source = wiki#toc#get_section()
+  " target_page could be given by user input with something like this:
+  " let l:opts.target_page = input('> ', '', 'customlist,wiki#complete#url')
+
+  let l:source = wiki#page#refile#collect_source(l:opts)
   if empty(l:source)
     return wiki#log#error('No source section recognized!')
   endif
-  let l:source.path = expand('%:p')
 
-  " Collect target data
-  let l:target = {}
-  let l:target.path = wiki#u#eval_filename(l:opts.target_page)
-  if !filereadable(l:target.path)
+  try
+    let l:target = wiki#page#refile#collect_target(l:opts)
+  catch /wiki.vim: target page not found/
     return wiki#log#error('Target page was not found!')
-  endif
-  let l:target.lnum = l:opts.target_lnum
-  let l:target.node = wiki#paths#to_node(l:target.path)
-  let l:target.url = l:target.path !=# l:source.path
-        \ ? wiki#paths#to_wiki_url(l:target.path, wiki#get_root())
-        \ : ''
+  catch /wiki.vim: anchor not recognized/
+    return wiki#log#error('Target anchor not recognized!')
+  endtry
 
   call wiki#log#info(
-        \ printf('Refiling section "%s" to page "%s"',
-        \ l:source.header, l:target.node))
-
-  " Determine target anchor
-  let l:current_anchors = get(wiki#toc#get_section(#{
-        \ path: l:target.path,
-        \ at_lnum: l:opts.target_lnum
-        \}), 'anchors', [])
-  let l:target_anchors = l:source.level > 1
-        \ ? l:current_anchors[:l:source.level - 2]
-        \ : []
-  call add(l:target_anchors, l:source.anchors[-1])
-  let l:target.anchor = '#' . join(l:target_anchors, '#')
-
-  " Move the section lines
-  if empty(l:target.url)
-    call execute(printf('%d,%dm %d',
-          \ l:source.lnum, l:source.lnum_end, l:target.lnum))
-    silent write
-  else
-    let l:lines = getline(l:source.lnum, l:source.lnum_end)
-    call deletebufline('', l:source.lnum, l:source.lnum_end)
-    silent write
-
-    let l:current_bufnr = bufnr('')
-    let l:was_loaded = bufloaded(l:target.path)
-    keepalt execute 'silent edit' fnameescape(l:target.path)
-    call append(l:target.lnum, l:lines)
-    silent write
-    if !l:was_loaded
-      keepalt execute 'bwipeout'
-    endif
-    keepalt execute 'buffer' l:current_bufnr
-  endif
+        \ printf('Moving section "%s" into "%s"',
+        \ l:source.header, wiki#paths#to_node(l:target.path)))
+
+  call wiki#page#refile#move(l:source, l:target)
 
   call s:update_links_local(l:source, l:target)
   call s:update_links_external(l:source, l:target)

autoload/wiki/page/refile.vim

@@ -0,0 +1,107 @@
+" A wiki plugin for Vim
+"
+" Maintainer: Karl Yngve Lervåg
+" Email:      [email protected]
+"
+
+function! wiki#page#refile#collect_source() abort " {{{1
+  " Returns:
+  "   source: dict(path, lnum, lnum_end, header, anchor)
+  let l:source = wiki#toc#get_section()
+  if !empty(l:source)
+    let l:source.path = expand('%:p')
+  endif
+
+  return l:source
+endfunction
+
+" }}}1
+function! wiki#page#refile#collect_target(opts) abort " {{{1
+  " Returns:
+  "   source: dict(path, lnum, anchor)
+
+  let l:path = wiki#u#eval_filename(l:opts.target_page)
+  if !filereadable(l:path)
+    throw 'wiki.vim: target page not found'
+  endif
+
+
+  if has_key(l:opts, 'target_anchor_before')
+    return s:collect_target_by_anchor_before(l:path, l:opts.target_anchor_before)
+  endif
+
+  return s:collect_target_by_lnum(l:path, l:opts.target_lnum)
+endfunction
+
+" }}}1
+function! wiki#page#refile#move(source, target) abort " {{{1
+  " Arguments:
+  "   source: dict(path, lnum, lnum_end)
+  "   target: dict(path, lnum)
+
+  if l:target.path ==# l:source.path
+    call execute(printf('%d,%dm %d',
+          \ l:source.lnum, l:source.lnum_end, l:target.lnum))
+    silent write
+  else
+    let l:lines = getline(l:source.lnum, l:source.lnum_end)
+    call deletebufline('', l:source.lnum, l:source.lnum_end)
+    silent write
+
+    let l:current_bufnr = bufnr('')
+    let l:was_loaded = bufloaded(l:target.path)
+    keepalt execute 'silent edit' fnameescape(l:target.path)
+    call append(l:target.lnum, l:lines)
+    silent write
+    if !l:was_loaded
+      keepalt execute 'bwipeout'
+    endif
+    keepalt execute 'buffer' l:current_bufnr
+  endif
+endfunction
+
+" }}}1
+
+function! s:collect_target_anchor_before(path, anchor) abort " {{{1
+  let l:target_toc = wiki#toc#get_entries(#{ path: l:target.path })
+
+    for l:target_sec in l:target_toc
+      if l:target_sec.anchor ==# l:opts.target_anchor_before
+        break
+      endif
+    endfor
+
+    if empty(l:target_sec)
+      throw 'wiki.vim: anchor not recognized'
+    endif
+
+    let l:target.lnum = l:target_sec.lnum
+
+    let l:target_anchors = get(l:target_sec, 'anchors', [])
+    if len(l:target_anchors) > 0
+      call remove(l:target_anchors, -1)
+    endif
+    call add(l:target_anchors, l:source.anchors[-1])
+    let l:target.anchor = '#' . join(l:target_anchors, '#')
+endfunction
+
+" }}}1
+function! s:collect_target_by_lnum(path, lnum) abort " {{{1
+  let l:current_anchors = get(wiki#toc#get_section(#{
+        \ path: l:target.path,
+        \ at_lnum: l:.target_lnum
+        \}), 'anchors', [])
+  let l:target_anchors = l:source.level > 1
+        \ ? l:current_anchors[:l:source.level - 2]
+        \ : []
+  call add(l:target_anchors, l:source.anchors[-1])
+  let l:target.anchor = '#' . join(l:target_anchors, '#')
+
+  let l:target = {
+        \ 'path': a:path,
+        \ 'lnum': a:lnum,
+        \}
+
+endfunction
+
+" }}}1