Bump version to 1.0.0

Author: lucerion

autoload/extract.vim

@@ -2,11 +2,11 @@
 " Description:  Extract selection to a new buffer
 " Author:       Alexander Skachko <alexander.skachko@gmail.com>
 " Homepage:     https://github.com/lucerion/vim-extract
-" Version:      0.4.0 (2016-09-19)
+" Version:      1.0.0 (2017-09-03)
 " Licence:      BSD-3-Clause
 " ==============================================================
 
-func! extract#extract(selection, buffer_options)
+func! extract#extract(selection, buffer_options) abort
   if exists('g:loaded_buffr')
     call s:extract(a:selection, a:buffer_options)
   else
@@ -15,62 +15,66 @@ func! extract#extract(selection, buffer_options)
   endif
 endfunc
 
-func! s:extract(selection, buffer_options)
+func! s:extract(selection, buffer_options) abort
   let l:selection = getline(a:selection.start_line, a:selection.end_line)
 
   if a:selection.count
     call s:delete_lines(a:selection.start_line, a:selection.end_line)
   endif
+
   call s:open_buffer(a:buffer_options)
+
   if a:buffer_options.clear
     call s:clear_buffer()
   end
+
   if a:selection.count
     call s:insert_selection(l:selection)
+
     if g:extract_hidden
       call s:close_buffer()
     endif
   endif
 endfunc
 
-func! s:open_buffer(buffer_options)
+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)
 endfunc
 
-func! s:close_buffer()
+func! s:close_buffer() abort
   silent exec 'close'
 endfunc
 
-func! s:buffer_options(buffer_options)
+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()
-  silent exec 'normal! ggVGd'
+func! s:clear_buffer() abort
+  call s:delete_lines(1, '$')
 endfunc
 
-func! s:insert_selection(selection)
+func! s:insert_selection(selection) abort
   let l:last_line = line('$')
   if l:last_line == 1
     call append(0, a:selection)
-    silent exec 'normal! Gdd'
+    call s:delete_lines('$', '$')
   else
     call append(l:last_line, a:selection)
     silent exec 'normal! G'
   endif
 endfunc
 
-func! s:delete_lines(start_line, end_line)
-  exec a:start_line . ',' . a:end_line . ' delete'
+func! s:delete_lines(start_line, end_line) abort
+  silent exec a:start_line . ',' . a:end_line . ' delete _'
 endfunc
 
-func! s:set_buffer_defaults(buffer_options)
+func! s:set_buffer_defaults(buffer_options) abort
   setlocal buftype=nofile
   setlocal bufhidden=hide
   setlocal nobuflisted
@@ -84,27 +88,27 @@ func! s:set_buffer_defaults(buffer_options)
   augroup END
 endfunc
 
-func! s:save_state()
+func! s:save_state() abort
   if expand('<afile>') == s:buffer_options.name && !s:is_buffer_empty()
     exec 'write /tmp/' . s:buffer_options.name
   endif
 endfunc
 
-func! s:load_state()
+func! s:load_state() abort
   let l:file = '/tmp/' . s:buffer_options.name
   if expand('<afile>') == s:buffer_options.name && filereadable(l:file)
     if !s:buffer_options.clear
       call append(0, readfile(l:file))
-      silent exec 'normal! Gdd'
+      call s:delete_lines('$', '$')
     endif
-    exec '!rm ' . l:file
+    call delete(l:file)
   endif
 endfunc
 
-func! s:is_buffer_empty()
+func! s:is_buffer_empty() abort
   return line('$') == 1 && getline(1) == '' ? 1 : 0
 endfunc
 
-func! s:show_error(message)
+func! s:show_error(message) abort
   echohl ErrorMsg | echomsg a:message | echohl None
 endfunc

doc/vim-extract.txt

@@ -2,7 +2,7 @@
 
 Author:            Alexander Skachko <alexander.skachko@gmail.com>
 Homepage:          https://github.com/lucerion/vim-extract
-Version:           0.4.0 (2016-09-19)
+Version:           1.0.0 (2017-09-03)
 Licence:           BSD-3-Clause (see LICENSE)
 
 ===============================================================================
@@ -91,11 +91,20 @@ Default: 0
 ===============================================================================
 CHANGELOG                                               *vim-extract-changelog*
 
+1.0.0 (2017-09-03)~
+
+  Changes
+    * option g:extract_name renamed to g:extract_buffer_name
+    * clear buffer before selection insert if command called with bang
+    * restore buffer content if buffer closed without save
+
 0.4.0 (2016-09-19)~
+
   Changes
     * extract selection without opening the extract buffer option was added
 
 0.3.0 (2016-03-27)~
+
   vim-buffr plugin version 0.3 required
 
   Changes
@@ -106,11 +115,13 @@ CHANGELOG                                               *vim-extract-changelog*
     * g:extract_position option was removed
 
 0.2.0 (2016-02-05)~
+
   Changes
     * buffr#open function name was changed to buffr#open_or_create
     * Extract command was renamed to VExtract (vim-rails plugin conflict)
 
 0.1.0 (2015-12-06)~
+
   First release
 
 ===============================================================================

plugin/extract.vim

@@ -2,13 +2,14 @@
 " Description:  Extract selection to a new buffer
 " Author:       Alexander Skachko <alexander.skachko@gmail.com>
 " Homepage:     https://github.com/lucerion/vim-extract
-" Version:      0.4.0 (2016-09-19)
+" Version:      1.0.0 (2017-09-03)
 " Licence:      BSD-3-Clause
 " ==============================================================
 
-if exists('g:loaded_extract') || &compatible || (v:version < 700)
+if exists('g:loaded_extract') || &compatible || v:version < 700
   finish
 endif
+let g:loaded_extract = 1
 
 if !exists('g:extract_buffer_name')
   let g:extract_buffer_name = '_{filename}'
@@ -50,5 +51,3 @@ endfunc
 
 comm! -nargs=* -range=0 -bang -complete=customlist,s:autocompletion Extr
   \ call s:extract(<line1>, <line2>, <count>, !empty('<bang>'), <f-args>)
-
-let g:loaded_extract = 1