Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmd: execute go run in the buffer's directory #2782

Merged
merged 2 commits into from
Mar 23, 2020
Merged

cmd: execute go run in the buffer's directory #2782

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13a7fc2
cmd: execute go run in the buffer's directory
bhcleek Mar 21, 2020
0e8aef5
cmd: use the local variable prefix, l:, for clarity and consistency i…
bhcleek Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions autoload/go/cmd.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,30 @@ function! go#cmd#Run(bang, ...) abort

call go#statusline#Update(expand('%:p:h'), l:status)

let cmd = "go run "
let tags = go#config#BuildTags()
if len(tags) > 0
let cmd .= "-tags " . go#util#Shellescape(tags) . " "
let l:cmd = "go run "
let l:tags = go#config#BuildTags()
if len(l:tags) > 0
let l:cmd .= "-tags " . go#util#Shellescape(l:tags) . " "
endif

if a:0 == 0
let l:files = go#tool#Files()
else
let l:files = map(copy(a:000), "expand(v:val)")
endif

let l:cmd = printf('%s%s', l:cmd, go#util#Shelljoin(l:files, 1))

let l:cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
let l:dir = getcwd()

if go#util#IsWin()
if a:0 == 0
exec '!' . cmd . go#util#Shelljoin(go#tool#Files(), 1)
else
exec '!' . cmd . go#util#Shelljoin(map(copy(a:000), "expand(v:val)"), 1)
endif
try
execute l:cd . fnameescape(expand("%:p:h"))
exec printf('!%s', l:cmd)
finally
execute l:cd . fnameescape(l:dir)
endtry

let l:status.state = 'success'
if v:shell_error
Expand All @@ -186,29 +198,28 @@ function! go#cmd#Run(bang, ...) abort
endif

" :make expands '%' and '#' wildcards, so they must also be escaped
let default_makeprg = &makeprg
if a:0 == 0
let &makeprg = cmd . go#util#Shelljoin(go#tool#Files(), 1)
else
let &makeprg = cmd . go#util#Shelljoin(map(copy(a:000), "expand(v:val)"), 1)
endif
let l:default_makeprg = &makeprg
let &makeprg = l:cmd

let l:listtype = go#list#Type("GoRun")

let l:status.state = 'success'

try
" backup user's errorformat, will be restored once we are finished
let l:old_errorformat = &errorformat
let &errorformat = s:runerrorformat()
execute l:cd . fnameescape(expand("%:p:h"))
if l:listtype == "locationlist"
exe 'lmake!'
else
exe 'make!'
endif
finally
"restore errorformat
"restore the working directory, errformat, and makeprg
execute cd . fnameescape(l:dir)
let &errorformat = l:old_errorformat
let &makeprg = default_makeprg
let &makeprg = l:default_makeprg
endtry

let l:errors = go#list#Get(l:listtype)
Expand Down