Remove position and default file name options

Use window split modes instead of position

Author: lucerion

autoload/extract.vim

@@ -7,11 +7,11 @@
 " ==============================================================
 
 func! extract#extract(selection, buffer_options) abort
-  if exists('g:loaded_buffr')
-    call s:extract(a:selection, a:buffer_options)
-  else
+  if !exists('g:loaded_buffr')
     call s:show_error('Please, install vim-buffr') | return
   endif
+
+  call s:extract(a:selection, a:buffer_options)
 endfunc
 
 func! s:extract(selection, buffer_options) abort
@@ -37,23 +37,14 @@ func! s:extract(selection, buffer_options) abort
 endfunc
 
 func! s:open_buffer(buffer_options) abort
-  let l:buffer_options = s:buffer_options(a:buffer_options)
-  call buffr#open_or_create_buffer(l:buffer_options)
-  call s:set_buffer_defaults(l:buffer_options)
+  call buffr#open_or_create_buffer(a:buffer_options.name, a:buffer_options.mods)
+  call s:set_buffer_defaults(a:buffer_options)
 endfunc
 
 func! s:close_buffer() abort
   silent exec 'close'
 endfunc
 
-func! s:buffer_options(buffer_options) abort
-  let l:default_buffer_options = {
-  \  'name': substitute(g:extract_buffer_name, '{filename}', expand('%:t'), 'g')
-  \ }
-
-  return extend(l:default_buffer_options, a:buffer_options)
-endfunc
-
 func! s:clear_buffer() abort
   call s:delete_lines(1, '$')
 endfunc
@@ -67,6 +58,7 @@ func! s:insert_selection(selection) abort
     call append(l:last_line, a:selection)
     silent exec 'normal! G'
   endif
+
 endfunc
 
 func! s:delete_lines(start_line, end_line) abort

doc/vim-extract.txt

@@ -53,41 +53,17 @@ COMMANDS                                                 *vim-extract-commands*
 
                                                                         *:Extr*
 
-:[range]Extr[!] {position} {buffer-name}
+:[range]Extr[!] {buffer-name}
 
   In the Visual mode - extracts selection to a new buffer, in the Normal
   mode - opens an extract buffer.
   If `!` is given buffer will be cleared before selection insert.
-  Without 'position' argument an extract buffer will be opened with the last
-  or default position.
-
-  Positions: -top, -bottom, -left, -right, -tab
-  Default position: -top
+  Window split modes (|leftabove|, |rightbelow|, |topleft|, |botright|,
+  |vsplit|, |tab|, etc) are available.
 
 ===============================================================================
 OPTIONS                                                   *vim-extract-options*
 
-                                                   *g:extract_default_position*
-
-Default extract buffer position.
-
-  Possible values: 'top', 'bottom', 'left', 'right', 'tab'
-  Default value: 'top'
-
-                                                        *g:extract_buffer_name*
-
-Extract buffer name pattern. {filename} string replaces with the current filename
-name. This option uses if :Extr command called without 'name' argument.
-
-  Default value: '_{filename}'
-
-                                                             *g:extract_append*
-
-Append selection to the end of the extract buffer (1) or clear the extract
-buffer before insert (0).
-
-  Default value: 1
-
                                                              *g:extract_hidden*
 
 Extract selection without opening the extract buffer.

plugin/extract.vim

@@ -11,45 +11,24 @@ if exists('g:loaded_extract') || &compatible || v:version < 700
 endif
 let g:loaded_extract = 1
 
-if !exists('g:extract_buffer_name')
-  let g:extract_buffer_name = '_{filename}'
-endif
-
 if !exists('g:extract_hidden')
   let g:extract_hidden = 0
 endif
 
-if !exists('g:extract_default_position')
-  let g:extract_default_position = 'top'
-endif
-
-let s:allowed_position_args = ['-top', '-bottom', '-left', '-right', '-tab']
-
-func! s:autocompletion(input, command_line, cursor_position) abort
-  return filter(s:allowed_args, 'v:val =~ a:input')
-endfunc
-
-func! s:extract(start_line, end_line, count, clear, ...) abort
+func! s:extract(start_line, end_line, count, clear, mods, name) abort
   let l:selection = {
     \ 'start_line': a:start_line,
     \ 'end_line': a:end_line,
     \ 'count': a:count
     \ }
-  let l:buffer_options = { 'clear': a:clear }
 
-  let l:name_args = filter(copy(a:000), 'index(s:allowed_position_args, v:val) < 0')
-  if len(l:name_args)
-    let l:buffer_options.name = join(l:name_args)
-  endif
-
-  let l:buffer_options.position = g:extract_default_position
-  let l:position_args = filter(copy(a:000), 'index(s:allowed_position_args, v:val) >= 0')
-  if len(l:position_args)
-    let l:buffer_options.position = substitute(l:position_args[-1], '-', '', 'g')
-  endif
+  let l:buffer_options = {
+    \ 'name': a:name,
+    \ 'clear': a:clear,
+    \ 'mods': a:mods
+    \ }
 
   call extract#extract(l:selection, l:buffer_options)
 endfunc
 
-comm! -nargs=* -range=0 -bang -complete=customlist,s:autocompletion Extr
-  \ call s:extract(<line1>, <line2>, <count>, !empty('<bang>'), <f-args>)
+comm! -nargs=? -range=0 -bang Extr call s:extract(<line1>, <line2>, <count>, !empty('<bang>'), <q-mods>, <q-args>)