Merge pull request #57 from lambdalisue/hotfix/write_related_critical…

…_issues

Fix Gista post/patch, on_BufWriteCmd, and on_FileWriteCmd

autoload/gista/autocmd.vim

@@ -79,9 +79,12 @@ function! s:on_BufWriteCmd(gista) abort
             \)
       return
     endif
+    let filename = a:gista.filename
+    let content = gista#util#ensure_eol(join(getline(1, '$'), "\n"))
     let gist = gista#command#patch#call({
-          \ '__range__': [line('1'), line('$')],
           \ 'gistid': a:gista.gistid,
+          \ 'filenames': [filename],
+          \ 'contents': [{ 'content': content }],
           \ 'force': v:cmdbang,
           \})
     if empty(gist)
@@ -113,9 +116,12 @@ function! s:on_FileWriteCmd(gista) abort
             \)
       return
     endif
+    let filename = a:gista.filename
+    let content = gista#util#ensure_eol(join(getline("'[", "']"), "\n"))
     let gist = gista#command#patch#call({
-          \ '__range__': [line("'["), line("']")],
           \ 'gistid': a:gista.gistid,
+          \ 'filenames': [filename],
+          \ 'contents': [{ 'content': content }],
           \ 'force': v:cmdbang,
           \})
     if empty(gist)

autoload/gista/command/patch.vim

@@ -9,9 +9,7 @@ function! s:get_content(expr) abort
         \ ? getbufline(a:expr, 1, '$')
         \ : readfile(a:expr),
         \ "\n")
-  let content = content =~# '\r?\n$'
-        \ ? content
-        \ : content . "\n"
+  let content = gista#util#ensure_eol(content)
   return { 'content': content }
 endfunction
 
@@ -29,9 +27,10 @@ function! gista#command#patch#call(...) abort
           \)
     let gist = gista#resource#remote#patch(gistid, options)
     if index(options.filenames, expand('%:t'))
+      let filename = fnamemodify(gista#option#guess_filename('%'), ':t')
       let bufname = gista#command#open#bufname({
             \ 'gistid': gistid,
-            \ 'filename': expand('%:t'),
+            \ 'filename': filename,
             \})
       silent execute printf('file %s', bufname)
     endif
@@ -93,10 +92,9 @@ function! gista#command#patch#command(...) abort
     let filename = empty(filename)
           \ ? 'gista-file'
           \ : filename
-    let content = join(call('getline', options.__range__), "\n")
-    let content = content =~# '\r?\n$'
-          \ ? content
-          \ : content . "\n"
+    let content = gista#util#ensure_eol(
+          \ join(call('getline', options.__range__), "\n")
+          \)
     let options.filenames = [filename]
     let options.contents = [{ 'content': content }]
   else

autoload/gista/command/post.vim

@@ -9,9 +9,7 @@ function! s:get_content(expr) abort
         \ ? getbufline(a:expr, 1, '$')
         \ : readfile(a:expr),
         \ "\n")
-  let content = content =~# '\r?\n$'
-        \ ? content
-        \ : content . "\n"
+  let content = gista#util#ensure_eol(content)
   return { 'content': content }
 endfunction
 function! s:interactive_description(options) abort
@@ -50,9 +48,10 @@ function! gista#command#post#call(...) abort
           \)
     let client = gista#client#get()
     if index(options.filenames, expand('%:t'))
+      let filename = fnamemodify(gista#option#guess_filename('%'), ':t')
       let bufname = gista#command#open#bufname({
             \ 'gistid': gist.id,
-            \ 'filename': expand('%:t'),
+            \ 'filename': filename,
             \})
       silent execute printf('file %s', bufname)
     endif
@@ -118,10 +117,9 @@ function! gista#command#post#command(...) abort
     let filename = empty(filename)
           \ ? 'gista-file'
           \ : filename
-    let content = join(call('getline', options.__range__), "\n")
-    let content = content =~# '\r?\n$'
-          \ ? content
-          \ : content . "\n"
+    let content = gista#util#ensure_eol(
+          \ join(call('getline', options.__range__), "\n")
+          \)
     let options.filenames = [filename]
     let options.contents = [{ 'content': content }]
   else