merge

sources_non_forked/vim-go/autoload/go/rename.vim

@@ -1,52 +1,152 @@
 if !exists("g:go_gorename_bin")
-    let g:go_gorename_bin = "gorename"
+  let g:go_gorename_bin = "gorename"
 endif
 
-function! go#rename#Rename(...)
-    let to = ""
-    if a:0 == 0
-        let ask = printf("vim-go: rename '%s' to: ",  expand("<cword>"))
-        let to = input(ask)
-        redraw
+if !exists("g:go_gorename_prefill")
+  let g:go_gorename_prefill = 1
+endif
+
+function! go#rename#Rename(bang, ...) abort
+  let to_identifier = ""
+  if a:0 == 0
+    let from = expand("<cword>")
+    let ask = printf("vim-go: rename '%s' to: ", from)
+    if g:go_gorename_prefill
+      let to_identifier = input(ask, from)
     else
-        let to = a:1
+      let to_identifier = input(ask)
     endif
-
-
-    "return with a warning if the bin doesn't exist
-    let bin_path = go#tool#BinPath(g:go_gorename_bin) 
-    if empty(bin_path) 
-        return 
+    redraw!
+    if empty(to_identifier)
+      return
     endif
+  else
+    let to_identifier = a:1
+  endif
 
-    let fname = expand('%:p:t')
-    let pos = s:getpos(line('.'), col('.'))
-    let cmd = printf('%s -offset %s:#%d -to %s',  bin_path, shellescape(fname), pos, to)
+  "return with a warning if the bin doesn't exist
+  let bin_path = go#path#CheckBinPath(g:go_gorename_bin)
+  if empty(bin_path)
+    return
+  endif
 
-    let out = go#tool#ExecuteInDir(cmd)
+  let fname = expand('%:p')
+  let pos = go#util#OffsetCursor()
+  let offset = printf('%s:#%d', fname, pos)
 
-    " strip out newline on the end that gorename puts. If we don't remove, it
-    " will trigger the 'Hit ENTER to continue' prompt
-    let clean = split(out, '\n')
+  " no need to escape for job call
+  let bin_path = go#util#has_job() ? bin_path : shellescape(bin_path)
+  let offset = go#util#has_job() ? offset : shellescape(offset)
+  let to_identifier = go#util#has_job() ? to_identifier : shellescape(to_identifier)
 
-    if v:shell_error
-        redraw | echon "vim-go: " | echohl Statement | echon clean[0] | echohl None
-    else
-        redraw | echon "vim-go: " | echohl Function | echon clean[0] | echohl None
-    endif
+  let cmd = [bin_path, "-offset", offset, "-to", to_identifier]
 
-    " refresh the buffer so we can see the new content
-    silent execute ":e"
+  " check for any tags
+  if exists('g:go_build_tags')
+    let tags = get(g:, 'go_build_tags')
+    call extend(cmd, ["-tags", tags])
+  endif
+
+  if go#util#has_job()
+    call go#util#EchoProgress(printf("renaming to '%s' ...", to_identifier))
+    call s:rename_job({
+          \ 'cmd': cmd,
+          \ 'bang': a:bang,
+          \})
+    return
+  endif
+
+  let command = join(cmd, " ")
+  let out = go#tool#ExecuteInDir(command)
+
+  let splitted = split(out, '\n')
+  call s:parse_errors(go#util#ShellError(), a:bang, splitted)
 endfunction
 
-func! s:getpos(l, c)
-    if &encoding != 'utf-8'
-        let buf = a:l == 1 ? '' : (join(getline(1, a:l-1), "\n") . "\n")
-        let buf .= a:c == 1 ? '' : getline('.')[:a:c-2]
-        return len(iconv(buf, &encoding, 'utf-8'))
-    endif
-    return line2byte(a:l) + (a:c-2)
-endfun
+function s:rename_job(args)
+  let messages = []
+  function! s:callback(chan, msg) closure
+    call add(messages, a:msg)
+  endfunction
 
-" vim:ts=4:sw=4:et
-"
+  let status_dir =  expand('%:p:h')
+
+  function! s:close_cb(chan) closure
+    let l:job = ch_getjob(a:chan)
+    let l:info = job_info(l:job)
+
+    let status = {
+          \ 'desc': 'last status',
+          \ 'type': "gorename",
+          \ 'state': "finished",
+          \ }
+
+    if l:info.exitval
+      let status.state = "failed"
+    endif
+
+    call go#statusline#Update(status_dir, status)
+
+    call s:parse_errors(l:info.exitval, a:args.bang, messages)
+  endfunction
+
+  let start_options = {
+        \ 'callback': funcref("s:callback"),
+        \ 'close_cb': funcref("s:close_cb"),
+        \ }
+
+  " modify GOPATH if needed
+  let old_gopath = $GOPATH
+  let $GOPATH = go#path#Detect()
+
+  call go#statusline#Update(status_dir, {
+        \ 'desc': "current status",
+        \ 'type': "gorename",
+        \ 'state': "started",
+        \})
+
+  call job_start(a:args.cmd, start_options)
+
+  let $GOPATH = old_gopath
+endfunction
+
+function s:parse_errors(exit_val, bang, out)
+  " reload all files to reflect the new changes. We explicitly call
+  " checktime to trigger a reload of all files. See
+  " http://www.mail-archive.com/vim@vim.org/msg05900.html for more info
+  " about the autoread bug
+  let current_autoread = &autoread
+  set autoread
+  silent! checktime
+  let &autoread = current_autoread
+
+  let l:listtype = "quickfix"
+  if a:exit_val != 0
+    call go#util#EchoError("FAILED")
+    let errors = go#tool#ParseErrors(a:out)
+    call go#list#Populate(l:listtype, errors, 'Rename')
+    call go#list#Window(l:listtype, len(errors))
+    if !empty(errors) && !a:bang
+      call go#list#JumpToFirst(l:listtype)
+    elseif empty(errors)
+      " failed to parse errors, output the original content
+      call go#util#EchoError(join(a:out, ""))
+    endif
+
+    return
+  endif
+
+  " strip out newline on the end that gorename puts. If we don't remove, it
+  " will trigger the 'Hit ENTER to continue' prompt
+  call go#list#Clean(l:listtype)
+  call go#list#Window(l:listtype)
+  call go#util#EchoSuccess(a:out[0])
+
+  " refresh the buffer so we can see the new content
+  " TODO(arslan): also find all other buffers and refresh them too. For this
+  " we need a way to get the list of changes from gorename upon an success
+  " change.
+  silent execute ":e"
+endfunction
+
+" vim: sw=2 ts=2 et