diff --git a/pack/acp/start/vim-go/.dockerignore b/pack/acp/start/vim-go/.dockerignore
index 286d089..8a4b0bb 100644
--- a/pack/acp/start/vim-go/.dockerignore
+++ b/pack/acp/start/vim-go/.dockerignore
@@ -4,3 +4,5 @@
.dlv/
.git/
.viminfo
+issues/
+autoload/go/**/pkg/
diff --git a/pack/acp/start/vim-go/.github/FUNDING.yml b/pack/acp/start/vim-go/.github/FUNDING.yml
new file mode 100644
index 0000000..060026e
--- /dev/null
+++ b/pack/acp/start/vim-go/.github/FUNDING.yml
@@ -0,0 +1 @@
+patreon: bhcleek
diff --git a/pack/acp/start/vim-go/.github/ISSUE_TEMPLATE.md b/pack/acp/start/vim-go/.github/ISSUE_TEMPLATE.md
index f227239..687b021 100644
--- a/pack/acp/start/vim-go/.github/ISSUE_TEMPLATE.md
+++ b/pack/acp/start/vim-go/.github/ISSUE_TEMPLATE.md
@@ -1,21 +1,47 @@
-### What did you do? (required. The issue will be **closed** when not provided.)
+
+### What did you do? (required: The issue will be **closed** when not provided)
+
+
### What did you expect to happen?
-
### What happened instead?
-
### Configuration (**MUST** fill this out):
-* vim-go version:
+#### vim-go version:
-* `vimrc` you used to reproduce (use a *minimal* vimrc with other plugins disabled; do not link to a 2,000 line vimrc):
+#### `vimrc` you used to reproduce:
+
+
+vimrc
-* Go version (`go version`):
+
go env Output:
+
+
+
gopls version Output:
+
+
+
@@ -13,15 +15,15 @@ This plugin adds Go language support for Vim, with the following main features:
* Quickly execute your current file(s) with `:GoRun`.
* Improved syntax highlighting and folding.
* Debug programs with integrated `delve` support with `:GoDebugStart`.
-* Completion support via `gocode` and `gopls`.
-* `gofmt` or `goimports` on save keeps the cursor position and undo history.
+* Completion and many other features support via `gopls`.
+* formatting on save keeps the cursor position and undo history.
* Go to symbol/declaration with `:GoDef`.
* Look up documentation with `:GoDoc` or `:GoDocBrowser`.
* Easily import packages via `:GoImport`, remove them via `:GoDrop`.
* Precise type-safe renaming of identifiers with `:GoRename`.
* See which code is covered by tests with `:GoCoverage`.
* Add or remove tags on struct fields with `:GoAddTags` and `:GoRemoveTags`.
-* Call `gometalinter` with `:GoMetaLinter` to invoke all possible linters
+* Call `golangci-lint` with `:GoMetaLinter` to invoke all possible linters
(`golint`, `vet`, `errcheck`, `deadcode`, etc.) and put the result in the
quickfix or location list.
* Lint your code with `:GoLint`, run your code through `:GoVet` to catch static
@@ -30,10 +32,12 @@ This plugin adds Go language support for Vim, with the following main features:
`:GoCallees`, and `:GoReferrers`.
* ... and many more! Please see [doc/vim-go.txt](doc/vim-go.txt) for more
information.
+* The `gopls` instance can be shared with other Vim plugins.
+* Vim-go's use of `gopls` can be disabled.
## Install
-vim-go requires at least Vim 7.4.2009 or Neovim 0.3.1.
+vim-go requires at least Vim 8.0.1453 or Neovim 0.4.0.
The [**latest stable release**](https://github.com/fatih/vim-go/releases/latest) is the
recommended version to use. If you choose to use the master branch instead,
@@ -68,8 +72,28 @@ Depending on your installation method, you may have to generate the plugin's
[`help tags`](http://vimhelp.appspot.com/helphelp.txt.html#%3Ahelptags)
manually (e.g. `:helptags ALL`).
-We also have an [official vim-go tutorial](https://github.com/fatih/vim-go-tutorial).
+We also have an [official vim-go tutorial](https://github.com/fatih/vim-go/wiki).
+
+## FAQ and troubleshooting
+
+The FAQ and troubleshooting tips are in the documentation and can be quickly
+accessed using `:help go-troubleshooting`. If you believe you've found a bug or
+shortcoming in vim-go that is neither addressed by help nor in [existing
+issues](https://github.com/fatih/vim-go/issues), please open an issue with
+clear reproduction steps. `:GoReportGitHubIssue` can be used pre-populate a lot
+of the information needed when creating a new issue.
+
+## Contributing
+
+All PRs are welcome. If you are planning to contribute a large patch or to
+integrate a new tool, please create an issue first to get any upfront questions
+or design decisions out of the way first.
+
+You can run the tests locally by running `make`. It will lint the VimL for you,
+lint the documentation, and run the tests against the minimum required version
+of Vim, other versions of Vim that may be critical to support, and Neovim.
## License
The BSD 3-Clause License - see [`LICENSE`](LICENSE) for more details
+
diff --git a/pack/acp/start/vim-go/autoload/fzf/decls.vim b/pack/acp/start/vim-go/autoload/fzf/decls.vim
index 20e4f04..02bf462 100644
--- a/pack/acp/start/vim-go/autoload/fzf/decls.vim
+++ b/pack/acp/start/vim-go/autoload/fzf/decls.vim
@@ -121,10 +121,10 @@ function! s:source(mode,...) abort
\ decl.col
\)
call add(ret_decls, printf("%s\t%s %s\t%s",
- \ s:color(decl.ident . space, "Function"),
- \ s:color(decl.keyword, "Keyword"),
- \ s:color(pos, "SpecialComment"),
- \ s:color(decl.full, "Comment"),
+ \ s:color(decl.ident . space, "goDeclsFzfFunction"),
+ \ s:color(decl.keyword, "goDeclsFzfKeyword"),
+ \ s:color(pos, "goDeclsFzfSpecialComment"),
+ \ s:color(decl.full, "goDeclsFzfComment"),
\))
endfor
diff --git a/pack/acp/start/vim-go/autoload/go/auto.vim b/pack/acp/start/vim-go/autoload/go/auto.vim
index 1174858..4884320 100644
--- a/pack/acp/start/vim-go/autoload/go/auto.vim
+++ b/pack/acp/start/vim-go/autoload/go/auto.vim
@@ -11,7 +11,43 @@ function! go#auto#template_autocreate()
call go#template#create()
endfunction
-function! go#auto#echo_go_info()
+function! go#auto#complete_done()
+ call s:echo_go_info()
+ call s:ExpandSnippet()
+endfunction
+
+function! s:ExpandSnippet() abort
+ if !exists('v:completed_item') || empty(v:completed_item) || !go#config#GoplsUsePlaceholders()
+ return
+ endif
+
+
+ let l:engine = go#config#SnippetEngine()
+
+ if l:engine is 'ultisnips'
+ if !get(g:, 'did_plugin_ultisnips', 0)
+ return
+ endif
+ " the snippet may have a '{\}' in it. For UltiSnips, that should be spelled
+ " \{}. fmt.Printf is such a snippet that can be used to demonstrate.
+ let l:snippet = substitute(v:completed_item.word, '{\\}', '\{}', 'g')
+ call UltiSnips#Anon(l:snippet, v:completed_item.word, '', 'i')
+" elseif l:engine is 'neosnippet'
+" " TODO(bc): make the anonymous expansion for neosnippet work
+"
+" if !get(g:, 'loaded_neosnippet') is 1
+" return
+" endif
+"
+" " neosnippet#anonymous doesn't need a trigger, so replace the
+" " completed_item.word with an empty string before calling neosnippet#anonymous
+" let l:snippet = substitute(v:completed_item.word, '{\\}', '\{\}', 'g')
+" call setline('.', substitute(getline('.'), substitute(v:completed_item.word, '\', '\\', 'g'), '', ''))
+" call neosnippet#anonymous(l:snippet)
+ endif
+endfunction
+
+function! s:echo_go_info()
if !go#config#EchoGoInfo()
return
endif
@@ -21,46 +57,109 @@ function! go#auto#echo_go_info()
endif
let item = v:completed_item
- if !has_key(item, "info")
+ if !has_key(item, "user_data")
return
endif
- if empty(item.info)
+ if empty(item.user_data)
return
endif
- redraws! | echo "vim-go: " | echohl Function | echon item.info | echohl None
+ redraws! | echo "vim-go: " | echohl Function | echon item.user_data | echohl None
endfunction
-function! go#auto#auto_type_info()
- if !go#config#AutoTypeInfo() || !filereadable(expand('%:p'))
+let s:timer_id = 0
+
+" go#auto#update_autocmd() will be called on BufEnter,CursorHold. This
+" configures the augroup according to conditions below.
+"
+" | # | has_timer | should_enable | do |
+" |---|-----------|---------------|------------------------------------|
+" | 1 | false | false | return early |
+" | 2 | true | true | return early |
+" | 3 | true | false | clear the group and stop the timer |
+" | 4 | false | true | configure the group |
+function! go#auto#update_autocmd()
+ let has_timer = get(b:, 'has_timer')
+ let should_enable = go#config#AutoTypeInfo() || go#config#AutoSameids()
+ if (!has_timer && !should_enable) || (has_timer && should_enable)
return
endif
- " GoInfo automatic update
- call go#tool#Info(0)
+ if has_timer
+ augroup vim-go-buffer-auto
+ autocmd! *
+ augroup END
+ let b:has_timer = 0
+ call s:timer_stop()
+ return
+ endif
+
+ augroup vim-go-buffer-auto
+ autocmd! *
+ autocmd CursorMoved call s:timer_restart()
+ autocmd BufLeave call s:timer_stop()
+ augroup END
+ let b:has_timer = 1
+ call s:timer_start()
endfunction
-function! go#auto#auto_sameids()
- if !go#config#AutoSameids() || !filereadable(expand('%:p'))
- return
+function! s:timer_restart()
+ if isdirectory(expand('%:p:h'))
+ call s:timer_stop()
+ call s:timer_start()
endif
+endfunction
- " GoSameId automatic update
- call go#guru#SameIds(0)
+function! s:timer_stop()
+ if s:timer_id
+ call timer_stop(s:timer_id)
+ let s:timer_id = 0
+ endif
+endfunction
+
+function! s:timer_start()
+ let s:timer_id = timer_start(go#config#Updatetime(), function('s:handler'))
+endfunction
+
+function! s:handler(timer_id)
+ if go#config#AutoTypeInfo()
+ call go#tool#Info(0)
+ endif
+ if go#config#AutoSameids()
+ call go#guru#SameIds(0)
+ endif
+ let s:timer_id = 0
endfunction
function! go#auto#fmt_autosave()
- if !go#config#FmtAutosave() || !filereadable(expand('%:p'))
+ if !(isdirectory(expand('%:p:h')) && expand(':p') == expand('%:p'))
+ return
+ endif
+
+ if !(go#config#FmtAutosave() || go#config#ImportsAutosave())
+ return
+ endif
+
+ if go#config#ImportsAutosave() && !(go#config#FmtAutosave() && go#config#FmtCommand() == 'goimports')
+ call go#fmt#Format(1)
+
+ " return early when the imports mode is goimports, because there's no need
+ " to format again when goimports was run
+ if go#config#ImportsMode() == 'goimports'
+ return
+ endif
+ endif
+
+ if !go#config#FmtAutosave()
return
endif
- " Go code formatting on save
call go#fmt#Format(-1)
endfunction
function! go#auto#metalinter_autosave()
- if !go#config#MetalinterAutosave() || !filereadable(expand('%:p'))
+ if !go#config#MetalinterAutosave() || !isdirectory(expand('%:p:h'))
return
endif
@@ -69,7 +168,7 @@ function! go#auto#metalinter_autosave()
endfunction
function! go#auto#modfmt_autosave()
- if !go#config#ModFmtAutosave() || !filereadable(expand('%:p'))
+ if !(go#config#ModFmtAutosave() && isdirectory(expand('%:p:h')) && expand(':p') == expand('%:p'))
return
endif
@@ -78,7 +177,7 @@ function! go#auto#modfmt_autosave()
endfunction
function! go#auto#asmfmt_autosave()
- if !go#config#AsmfmtAutosave() || !filereadable(expand('%:p'))
+ if !(go#config#AsmfmtAutosave() && isdirectory(expand('%:p:h')) && expand(':p') == expand('%:p'))
return
endif
diff --git a/pack/acp/start/vim-go/autoload/go/cmd.vim b/pack/acp/start/vim-go/autoload/go/cmd.vim
index fdf2299..8867166 100644
--- a/pack/acp/start/vim-go/autoload/go/cmd.vim
+++ b/pack/acp/start/vim-go/autoload/go/cmd.vim
@@ -9,8 +9,8 @@ function! go#cmd#autowrite() abort
for l:nr in range(0, bufnr('$'))
if buflisted(l:nr) && getbufvar(l:nr, '&modified')
" Sleep one second to make sure people see the message. Otherwise it is
- " often immediacy overwritten by the async messages (which also don't
- " invoke the "hit ENTER" prompt).
+ " often immediately overwritten by the async messages (which also
+ " doesn't invoke the "hit ENTER" prompt).
call go#util#EchoWarning('[No write since last change]')
sleep 1
return
@@ -32,7 +32,7 @@ function! go#cmd#Build(bang, ...) abort
\ map(copy(a:000), "expand(v:val)") +
\ [".", "errors"]
- " Vim and Neovim async.
+ " Vim and Neovim async
if go#util#has_job()
call s:cmd_job({
\ 'cmd': ['go'] + args,
@@ -41,8 +41,15 @@ function! go#cmd#Build(bang, ...) abort
\ 'statustype': 'build'
\})
- " Vim 7.4 without async
+ " Vim without async
else
+ let l:status = {
+ \ 'desc': 'current status',
+ \ 'type': 'build',
+ \ 'state': "started",
+ \ }
+ call go#statusline#Update(expand('%:p:h'), l:status)
+
let default_makeprg = &makeprg
let &makeprg = "go " . join(go#util#Shelllist(args), ' ')
@@ -68,10 +75,16 @@ function! go#cmd#Build(bang, ...) abort
call go#list#Window(l:listtype, len(errors))
if !empty(errors) && !a:bang
call go#list#JumpToFirst(l:listtype)
+ let l:status.state = 'failed'
else
- call go#util#EchoSuccess("[build] SUCCESS")
+ let l:status.state = 'success'
+ if go#config#EchoCommandInfo()
+ call go#util#EchoSuccess("[build] SUCCESS")
+ endif
endif
+ call go#statusline#Update(expand('%:p:h'), l:status)
endif
+
endfunction
@@ -104,16 +117,15 @@ endfunction
" Run runs the current file (and their dependencies if any) in a new terminal.
function! go#cmd#RunTerm(bang, mode, files) abort
- let cmd = "go run "
- let tags = go#config#BuildTags()
- if len(tags) > 0
- let cmd .= "-tags " . go#util#Shellescape(tags) . " "
+ let cmd = ["go", "run"]
+ if len(go#config#BuildTags()) > 0
+ call extend(cmd, ["-tags", go#config#BuildTags()])
endif
if empty(a:files)
- let cmd .= go#util#Shelljoin(go#tool#Files())
+ call extend(cmd, go#tool#Files())
else
- let cmd .= go#util#Shelljoin(map(copy(a:files), "expand(v:val)"), 1)
+ call extend(cmd, map(copy(a:files), funcref('s:expandRunArgs')))
endif
call go#term#newmode(a:bang, cmd, s:runerrorformat(), a:mode)
endfunction
@@ -123,7 +135,7 @@ endfunction
" suitable for long running apps, because vim is blocking by default and
" calling long running apps will block the whole UI.
function! go#cmd#Run(bang, ...) abort
- if has('nvim')
+ if go#config#TermEnabled()
call go#cmd#RunTerm(a:bang, '', a:000)
return
endif
@@ -134,61 +146,101 @@ function! go#cmd#Run(bang, ...) abort
" anything. Once this is implemented we're going to make :GoRun async
endif
- let cmd = "go run "
- let tags = go#config#BuildTags()
- if len(tags) > 0
- let cmd .= "-tags " . go#util#Shellescape(tags) . " "
+ let l:status = {
+ \ 'desc': 'current status',
+ \ 'type': 'run',
+ \ 'state': "started",
+ \ }
+
+ call go#statusline#Update(expand('%:p:h'), l:status)
+
+ let l:cmd = ['go', 'run']
+ let l:tags = go#config#BuildTags()
+ if len(l:tags) > 0
+ let l:cmd = l:cmd + ['-tags', l:tags]
endif
+ if a:0 == 0
+ let l:files = go#tool#Files()
+ else
+ let l:files = map(copy(a:000), funcref('s:expandRunArgs'))
+ endif
+
+ let l:cmd = l:cmd + l:files
+
+ 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
+ if go#util#HasDebug('shell-commands')
+ call go#util#EchoInfo(printf('shell command: %s', string(l:cmd)))
+ endif
+ execute l:cd . fnameescape(expand("%:p:h"))
+ exec printf('!%s', go#util#Shelljoin(l:cmd, 1))
+ finally
+ execute l:cd . fnameescape(l:dir)
+ endtry
+
+ let l:status.state = 'success'
if v:shell_error
- redraws! | echon "vim-go: [run] " | echohl ErrorMsg | echon "FAILED"| echohl None
+ let l:status.state = 'failed'
+ if go#config#EchoCommandInfo()
+ redraws!
+ call go#util#EchoError('[run] FAILED')
+ endif
else
- redraws! | echon "vim-go: [run] " | echohl Function | echon "SUCCESS"| echohl None
+ if go#config#EchoCommandInfo()
+ redraws!
+ call go#util#EchoSuccess('[run] SUCCESS')
+ endif
endif
+ call go#statusline#Update(expand('%:p:h'), l:status)
return
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 = go#util#Shelljoin(l:cmd, 1)
let l:listtype = go#list#Type("GoRun")
- try
+ 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()
+
+ if go#util#HasDebug('shell-commands')
+ call go#util#EchoInfo('shell command: ' . l:cmd)
+ endif
+
+ 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)
call go#list#Window(l:listtype, len(l:errors))
- if !empty(l:errors) && !a:bang
- call go#list#JumpToFirst(l:listtype)
+ if !empty(l:errors)
+ let l:status.state = 'failed'
+ if !a:bang
+ call go#list#JumpToFirst(l:listtype)
+ endif
endif
-
+ call go#statusline#Update(expand('%:p:h'), l:status)
endfunction
" Install installs the package by simple calling 'go install'. If any argument
@@ -255,9 +307,18 @@ function! go#cmd#Generate(bang, ...) abort
let &makeprg = "go generate " . goargs . ' ' . gofiles
endif
- let l:listtype = go#list#Type("GoGenerate")
+ let l:status = {
+ \ 'desc': 'current status',
+ \ 'type': 'generate',
+ \ 'state': "started",
+ \ }
+ call go#statusline#Update(expand('%:p:h'), l:status)
- echon "vim-go: " | echohl Identifier | echon "generating ..."| echohl None
+ if go#config#EchoCommandInfo()
+ call go#util#EchoProgress('generating ...')
+ endif
+
+ let l:listtype = go#list#Type("GoGenerate")
try
if l:listtype == "locationlist"
@@ -273,13 +334,18 @@ function! go#cmd#Generate(bang, ...) abort
let errors = go#list#Get(l:listtype)
call go#list#Window(l:listtype, len(errors))
if !empty(errors)
+ let l:status.status = 'failed'
if !a:bang
call go#list#JumpToFirst(l:listtype)
endif
else
- redraws! | echon "vim-go: " | echohl Function | echon "[generate] SUCCESS"| echohl None
+ let l:status.status = 'success'
+ if go#config#EchoCommandInfo()
+ redraws!
+ call go#util#EchoSuccess('[generate] SUCCESS')
+ endif
endif
-
+ call go#statusline#Update(expand(':%:p:h'), l:status)
endfunction
function! s:runerrorformat()
@@ -288,6 +354,18 @@ function! s:runerrorformat()
return l:errorformat
endfunction
+" s:expandRunArgs expands arguments for go#cmd#Run according to the
+" documentation of :GoRun. When val is a readable file, it is expanded to the
+" full path so that go run can be executed in the current buffer's directory.
+" val is return unaltered otherwise to support non-file arguments to go run.
+function! s:expandRunArgs(idx, val) abort
+ let l:val = expand(a:val)
+ if !filereadable(l:val)
+ return l:val
+ endif
+
+ return fnamemodify(l:val, ':p')")
+endfunction
" ---------------------
" | Vim job callbacks |
" ---------------------
diff --git a/pack/acp/start/vim-go/autoload/go/complete.vim b/pack/acp/start/vim-go/autoload/go/complete.vim
index 987c484..b256e8c 100644
--- a/pack/acp/start/vim-go/autoload/go/complete.vim
+++ b/pack/acp/start/vim-go/autoload/go/complete.vim
@@ -2,276 +2,48 @@
let s:cpo_save = &cpo
set cpo&vim
-function! s:gocodeCommand(cmd, args) abort
- let l:gocode_bin = "gocode"
- let l:gomod = go#util#gomod()
- if filereadable(l:gomod)
- let l:gocode_bin = "gocode-gomod"
- endif
-
- let bin_path = go#path#CheckBinPath(l:gocode_bin)
- if empty(bin_path)
- return []
- endif
-
- let socket_type = go#config#GocodeSocketType()
-
- let cmd = [bin_path]
- let cmd = extend(cmd, ['-sock', socket_type])
- let cmd = extend(cmd, ['-f', 'vim'])
-
- if go#config#GocodeProposeBuiltins()
- let cmd = extend(cmd, ['-builtin'])
- endif
-
- if go#config#GocodeProposeSource()
- let cmd = extend(cmd, ['-source'])
- else
- let cmd = extend(cmd, ['-fallback-to-source', '-cache'])
- endif
-
- if go#config#GocodeUnimportedPackages()
- let cmd = extend(cmd, ['-unimported-packages'])
- endif
-
- let cmd = extend(cmd, [a:cmd])
- let cmd = extend(cmd, a:args)
-
- return cmd
-endfunction
-
-function! s:sync_gocode(cmd, args, input) abort
- " We might hit cache problems, as gocode doesn't handle different GOPATHs
- " well. See: https://github.com/nsf/gocode/issues/239
- let old_goroot = $GOROOT
- let $GOROOT = go#util#env("goroot")
-
- try
- let cmd = s:gocodeCommand(a:cmd, a:args)
- " gocode can sometimes be slow, so redraw now to avoid waiting for gocode
- " to return before redrawing automatically.
- redraw
-
- let [l:result, l:err] = go#util#Exec(cmd, a:input)
- finally
- let $GOROOT = old_goroot
- endtry
-
- if l:err != 0
- return "[0, []]"
- endif
-
- if &encoding != 'utf-8'
- let l:result = iconv(l:result, 'utf-8', &encoding)
- endif
-
- return l:result
-endfunction
-
-function! s:gocodeAutocomplete() abort
- " use the offset as is, because the cursor position is the position for
- " which autocomplete candidates are needed.
- return s:sync_gocode('autocomplete',
- \ [expand('%:p'), go#util#OffsetCursor()],
- \ go#util#GetLines())
-endfunction
-
" go#complete#GoInfo returns the description of the identifier under the
" cursor.
function! go#complete#GetInfo() abort
- return s:sync_info(0)
-endfunction
-
-function! go#complete#Info(showstatus) abort
- if go#util#has_job(1)
- return s:async_info(1, a:showstatus)
- else
- return s:sync_info(1)
- endif
-endfunction
-
-function! s:async_info(echo, showstatus)
- let state = {'echo': a:echo}
-
- " explicitly bind complete to state so that within it, self will
- " always refer to state. See :help Partial for more information.
- let state.complete = function('s:complete', [], state)
-
- " add 1 to the offset, so that the position at the cursor will be included
- " in gocode's search
- let offset = go#util#OffsetCursor()+1
-
- " We might hit cache problems, as gocode doesn't handle different GOPATHs
- " well. See: https://github.com/nsf/gocode/issues/239
- let env = {
- \ "GOROOT": go#util#env("goroot")
- \ }
-
- let opts = {
- \ 'bang': 1,
- \ 'complete': state.complete,
- \ 'for': '_',
- \ }
-
- if a:showstatus
- let opts.statustype = 'gocode'
- endif
-
- let opts = go#job#Options(l:opts)
-
- let cmd = s:gocodeCommand('autocomplete',
- \ [expand('%:p'), offset])
-
- " TODO(bc): Don't write the buffer to a file; pass the buffer directly to
- " gocode's stdin. It shouldn't be necessary to use {in_io: 'file', in_name:
- " s:gocodeFile()}, but unfortunately {in_io: 'buffer', in_buf: bufnr('%')}
- " doesn't work.
- call extend(opts, {
- \ 'env': env,
- \ 'in_io': 'file',
- \ 'in_name': s:gocodeFile(),
- \ })
-
- call go#job#Start(cmd, opts)
-endfunction
-
-function! s:complete(job, exit_status, messages) abort dict
- if a:exit_status != 0
- return
- endif
-
- if &encoding != 'utf-8'
- let i = 0
- while i < len(a:messages)
- let a:messages[i] = iconv(a:messages[i], 'utf-8', &encoding)
- let i += 1
- endwhile
- endif
-
- let result = s:info_filter(self.echo, join(a:messages, "\n"))
- call s:info_complete(self.echo, result)
-endfunction
-
-function! s:gocodeFile()
- let file = tempname()
- call writefile(go#util#GetLines(), file)
- return file
-endfunction
-
-function! s:sync_info(echo)
- " add 1 to the offset, so that the position at the cursor will be included
- " in gocode's search
- let offset = go#util#OffsetCursor()+1
-
- let result = s:sync_gocode('autocomplete',
- \ [expand('%:p'), offset],
- \ go#util#GetLines())
-
- let result = s:info_filter(a:echo, result)
- return s:info_complete(a:echo, result)
-endfunction
-
-function! s:info_filter(echo, result) abort
- if empty(a:result)
- return ""
- endif
-
- let l:result = eval(a:result)
- if len(l:result) != 2
- return ""
- endif
-
- let l:candidates = l:result[1]
- if len(l:candidates) == 1
- " When gocode panics in vim mode, it returns
- " [0, [{'word': 'PANIC', 'abbr': 'PANIC PANIC PANIC', 'info': 'PANIC PANIC PANIC'}]]
- if a:echo && l:candidates[0].info ==# "PANIC PANIC PANIC"
- return ""
- endif
-
- return l:candidates[0].info
- endif
-
- let filtered = []
- let wordMatch = '\<' . expand("") . '\>'
- " escape single quotes in wordMatch before passing it to filter
- let wordMatch = substitute(wordMatch, "'", "''", "g")
- let filtered = filter(l:candidates, "v:val.info =~ '".wordMatch."'")
-
- if len(l:filtered) == 0
- return "no matches"
- elseif len(l:filtered) > 1
- return "ambiguous match"
- endif
-
- return l:filtered[0].info
-endfunction
-
-function! s:info_complete(echo, result) abort
- if a:echo
- call go#util#ShowInfo(a:result)
- endif
-
- return a:result
-endfunction
-
-function! s:trim_bracket(val) abort
- let a:val.word = substitute(a:val.word, '[(){}\[\]]\+$', '', '')
- return a:val
-endfunction
-
-let s:completions = []
-
-function! go#complete#GocodeComplete(findstart, base) abort
- "findstart = 1 when we need to get the text length
- if a:findstart == 1
- let l:completions = []
- execute "silent let l:completions = " . s:gocodeAutocomplete()
-
- if len(l:completions) == 0 || len(l:completions) >= 2 && len(l:completions[1]) == 0
- " no matches. cancel and leave completion mode.
- call go#util#EchoInfo("no matches")
- return -3
- endif
-
- let s:completions = l:completions[1]
- return col('.') - l:completions[0] - 1
- "findstart = 0 when we need to return the list of completions
- else
- let s = getline(".")[col('.') - 1]
- if s =~ '[(){}\{\}]'
- return map(copy(s:completions[1]), 's:trim_bracket(v:val)')
- endif
-
- return s:completions[1]
- endif
+ return go#lsp#GetInfo()
endfunction
function! go#complete#Complete(findstart, base) abort
- let l:state = {'done': 0, 'matches': []}
+ if !go#config#GoplsEnabled()
+ return -3
+ endif
- function! s:handler(state, matches) abort dict
+ let l:state = {'done': 0, 'matches': [], 'start': -1}
+
+ function! s:handler(state, start, matches) abort dict
+ let a:state.start = a:start
let a:state.matches = a:matches
let a:state.done = 1
endfunction
"findstart = 1 when we need to get the start of the match
if a:findstart == 1
- call go#lsp#Completion(expand('%:p'), line('.'), col('.'), funcref('s:handler', [l:state]))
+ let [l:line, l:col] = getpos('.')[1:2]
+ let [l:line, l:col] = go#lsp#lsp#Position(l:line, l:col)
+ let l:completion = go#lsp#Completion(expand('%:p'), l:line, l:col, funcref('s:handler', [l:state]))
+ if l:completion
+ return -3
+ endif
while !l:state.done
sleep 10m
endwhile
- let s:completions = l:state.matches
-
if len(l:state.matches) == 0
" no matches. cancel and leave completion mode.
call go#util#EchoInfo("no matches")
return -3
endif
- return col('.')
+ let s:completions = l:state.matches
+
+ return go#lsp#lsp#PositionOf(getline(l:line+1), l:state.start-1)
+
else "findstart = 0 when we need to return the list of completions
return s:completions
endif
@@ -281,11 +53,11 @@ function! go#complete#ToggleAutoTypeInfo() abort
if go#config#AutoTypeInfo()
call go#config#SetAutoTypeInfo(0)
call go#util#EchoProgress("auto type info disabled")
- return
- end
-
- call go#config#SetAutoTypeInfo(1)
- call go#util#EchoProgress("auto type info enabled")
+ else
+ call go#config#SetAutoTypeInfo(1)
+ call go#util#EchoProgress("auto type info enabled")
+ endif
+ call go#auto#update_autocmd()
endfunction
" restore Vi compatibility settings
diff --git a/pack/acp/start/vim-go/autoload/go/complete_test.vim b/pack/acp/start/vim-go/autoload/go/complete_test.vim
index 4397142..ee00056 100644
--- a/pack/acp/start/vim-go/autoload/go/complete_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/complete_test.vim
@@ -2,23 +2,24 @@
let s:cpo_save = &cpo
set cpo&vim
-func! Test_GetInfo()
+func! Test_GetInfo_gopls()
+ let g:go_info_mode = 'gopls'
+ call s:getinfo()
+ unlet g:go_info_mode
+endfunction
+
+func! s:getinfo()
let l:filename = 'complete/complete.go'
let l:tmp = gotest#load_fixture(l:filename)
+ try
+ call cursor(8, 3)
- call cursor(8, 3)
-
- let g:go_info_mode = 'gocode'
- let expected = 'func Example(s string)'
- let actual = go#complete#GetInfo()
- call assert_equal(expected, actual)
-
- let g:go_info_mode = 'guru'
- call go#config#InfoMode()
- let actual = go#complete#GetInfo()
- call assert_equal(expected, actual)
-
- unlet g:go_info_mode
+ let expected = 'func Example(s string)'
+ let actual = go#complete#GetInfo()
+ call assert_equal(expected, actual)
+ finally
+ call delete(l:tmp, 'rf')
+ endtry
endfunction
" restore Vi compatibility settings
diff --git a/pack/acp/start/vim-go/autoload/go/config.vim b/pack/acp/start/vim-go/autoload/go/config.vim
index a3ef0a6..0e4fdeb 100644
--- a/pack/acp/start/vim-go/autoload/go/config.vim
+++ b/pack/acp/start/vim-go/autoload/go/config.vim
@@ -21,10 +21,12 @@ endfunction
function! go#config#SetBuildTags(value) abort
if a:value is ''
silent! unlet g:go_build_tags
+ call go#lsp#ResetWorkspaceDirectories()
return
endif
let g:go_build_tags = a:value
+ call go#lsp#ResetWorkspaceDirectories()
endfunction
function! go#config#TestTimeout() abort
@@ -47,8 +49,23 @@ function! go#config#TermMode() abort
return get(g:, 'go_term_mode', 'vsplit')
endfunction
+function! go#config#TermCloseOnExit() abort
+ return get(g:, 'go_term_close_on_exit', 1)
+endfunction
+
+function! go#config#TermReuse() abort
+ return get(g:, 'go_term_reuse', 0)
+endfunction
+
+function! go#config#SetTermCloseOnExit(value) abort
+ let g:go_term_close_on_exit = a:value
+endfunction
+
function! go#config#TermEnabled() abort
- return has('nvim') && get(g:, 'go_term_enabled', 0)
+ " nvim always support
+ " vim will support if terminal feature exists
+ let l:support = has('nvim') || has('terminal')
+ return support && get(g:, 'go_term_enabled', 0)
endfunction
function! go#config#SetTermEnabled(value) abort
@@ -72,7 +89,18 @@ function! go#config#StatuslineDuration() abort
endfunction
function! go#config#SnippetEngine() abort
- return get(g:, 'go_snippet_engine', 'automatic')
+ let l:engine = get(g:, 'go_snippet_engine', 'automatic')
+ if l:engine is? "automatic"
+ if get(g:, 'did_plugin_ultisnips') is 1
+ let l:engine = 'ultisnips'
+ elseif get(g:, 'loaded_neosnippet') is 1
+ let l:engine = 'neosnippet'
+ elseif get(g:, 'loaded_minisnip') is 1
+ let l:engine = 'minisnip'
+ endif
+ endif
+
+ return l:engine
endfunction
function! go#config#PlayBrowserCommand() abort
@@ -114,7 +142,7 @@ function! go#config#ListAutoclose() abort
endfunction
function! go#config#InfoMode() abort
- return get(g:, 'go_info_mode', 'gocode')
+ return get(g:, 'go_info_mode', 'gopls')
endfunction
function! go#config#GuruScope() abort
@@ -139,30 +167,13 @@ function! go#config#SetGuruScope(scope) abort
endif
endfunction
-function! go#config#GocodeUnimportedPackages() abort
- return get(g:, 'go_gocode_unimported_packages', 0)
-endfunction
-
-let s:sock_type = (has('win32') || has('win64')) ? 'tcp' : 'unix'
-function! go#config#GocodeSocketType() abort
- return get(g:, 'go_gocode_socket_type', s:sock_type)
-endfunction
-
-function! go#config#GocodeProposeBuiltins() abort
- return get(g:, 'go_gocode_propose_builtins', 1)
-endfunction
-
-function! go#config#GocodeProposeSource() abort
- return get(g:, 'go_gocode_propose_source', 0)
-endfunction
-
function! go#config#EchoCommandInfo() abort
return get(g:, 'go_echo_command_info', 1)
endfunction
function! go#config#DocUrl() abort
- let godoc_url = get(g:, 'go_doc_url', 'https://godoc.org')
- if godoc_url isnot 'https://godoc.org'
+ let godoc_url = get(g:, 'go_doc_url', 'https://pkg.go.dev')
+ if godoc_url isnot 'https://pkg.go.dev'
" strip last '/' character if available
let last_char = strlen(godoc_url) - 1
if godoc_url[last_char] == '/'
@@ -174,12 +185,15 @@ function! go#config#DocUrl() abort
return godoc_url
endfunction
+function! go#config#DocPopupWindow() abort
+ return get(g:, 'go_doc_popup_window', 0)
+endfunction
function! go#config#DefReuseBuffer() abort
return get(g:, 'go_def_reuse_buffer', 0)
endfunction
function! go#config#DefMode() abort
- return get(g:, 'go_def_mode', 'guru')
+ return get(g:, 'go_def_mode', 'gopls')
endfunction
function! go#config#DeclsIncludes() abort
@@ -192,9 +206,10 @@ endfunction
function! go#config#DebugWindows() abort
return get(g:, 'go_debug_windows', {
- \ 'stack': 'leftabove 20vnew',
- \ 'out': 'botright 10new',
\ 'vars': 'leftabove 30vnew',
+ \ 'stack': 'leftabove 20new',
+ \ 'goroutines': 'botright 10new',
+ \ 'out': 'botright 5new',
\ }
\ )
@@ -211,7 +226,7 @@ function! go#config#DebugCommands() abort
endfunction
function! go#config#DebugLogOutput() abort
- return get(g:, 'go_debug_log_output', 'debugger, rpc')
+ return get(g:, 'go_debug_log_output', 'debugger,rpc')
endfunction
function! go#config#LspLog() abort
@@ -236,6 +251,10 @@ function! go#config#AddtagsTransform() abort
return get(g:, 'go_addtags_transform', "snakecase")
endfunction
+function! go#config#AddtagsSkipUnexported() abort
+ return get(g:, 'go_addtags_skip_unexported', 0)
+endfunction
+
function! go#config#TemplateAutocreate() abort
return get(g:, "go_template_autocreate", 1)
endfunction
@@ -245,31 +264,15 @@ function! go#config#SetTemplateAutocreate(value) abort
endfunction
function! go#config#MetalinterCommand() abort
- return get(g:, "go_metalinter_command", "gometalinter")
+ return get(g:, "go_metalinter_command", "golangci-lint")
endfunction
function! go#config#MetalinterAutosaveEnabled() abort
- let l:default_enabled = ["vet", "golint"]
-
- if go#config#MetalinterCommand() == "golangci-lint"
- let l:default_enabled = ["govet", "golint"]
- endif
-
- return get(g:, "go_metalinter_autosave_enabled", default_enabled)
+ return get(g:, "go_metalinter_autosave_enabled", ["govet", "golint"])
endfunction
function! go#config#MetalinterEnabled() abort
- let l:default_enabled = ["vet", "golint", "errcheck"]
-
- if go#config#MetalinterCommand() == "golangci-lint"
- let l:default_enabled = ["govet", "golint"]
- endif
-
- return get(g:, "go_metalinter_enabled", default_enabled)
-endfunction
-
-function! go#config#MetalinterDisabled() abort
- return get(g:, "go_metalinter_disabled", [])
+ return get(g:, "go_metalinter_enabled", ["vet", "golint", "errcheck"])
endfunction
function! go#config#GolintBin() abort
@@ -296,6 +299,10 @@ function! go#config#FmtAutosave() abort
return get(g:, "go_fmt_autosave", 1)
endfunction
+function! go#config#ImportsAutosave() abort
+ return get(g:, 'go_imports_autosave', 0)
+endfunction
+
function! go#config#SetFmtAutosave(value) abort
let g:go_fmt_autosave = a:value
endfunction
@@ -340,8 +347,12 @@ function! go#config#FmtCommand() abort
return get(g:, "go_fmt_command", "gofmt")
endfunction
+function! go#config#ImportsMode() abort
+ return get(g:, "go_imports_mode", "goimports")
+endfunction
+
function! go#config#FmtOptions() abort
- return get(g:, "go_fmt_options", {})
+ return get(b:, "go_fmt_options", get(g:, "go_fmt_options", {}))
endfunction
function! go#config#FmtFailSilently() abort
@@ -356,8 +367,13 @@ function! go#config#PlayOpenBrowser() abort
return get(g:, "go_play_open_browser", 1)
endfunction
+function! go#config#RenameCommand() abort
+ " delegate to go#config#GorenameBin for backwards compatability.
+ return get(g:, "go_rename_command", go#config#GorenameBin())
+endfunction
+
function! go#config#GorenameBin() abort
- return get(g:, "go_gorename_bin", "gorename")
+ return get(g:, "go_gorename_bin", "gopls")
endfunction
function! go#config#GorenamePrefill() abort
@@ -451,10 +467,22 @@ function! go#config#HighlightVariableDeclarations() abort
return get(g:, 'go_highlight_variable_declarations', 0)
endfunction
+function! go#config#HighlightDiagnosticErrors() abort
+ return get(g:, 'go_highlight_diagnostic_errors', 1)
+endfunction
+
+function! go#config#HighlightDiagnosticWarnings() abort
+ return get(g:, 'go_highlight_diagnostic_warnings', 1)
+endfunction
+
function! go#config#HighlightDebug() abort
return get(g:, 'go_highlight_debug', 1)
endfunction
+function! go#config#DebugBreakpointSignText() abort
+ return get(g:, 'go_debug_breakpoint_sign_text', '>')
+endfunction
+
function! go#config#FoldEnable(...) abort
if a:0 > 0
return index(go#config#FoldEnable(), a:1) > -1
@@ -466,6 +494,82 @@ function! go#config#EchoGoInfo() abort
return get(g:, "go_echo_go_info", 1)
endfunction
+function! go#config#CodeCompletionEnabled() abort
+ return get(g:, "go_code_completion_enabled", 1)
+endfunction
+
+function! go#config#CodeCompletionIcase() abort
+ return get(g:, "go_code_completion_icase", 0)
+endfunction
+
+function! go#config#Updatetime() abort
+ let go_updatetime = get(g:, 'go_updatetime', 800)
+ return go_updatetime == 0 ? &updatetime : go_updatetime
+endfunction
+
+function! go#config#ReferrersMode() abort
+ return get(g:, 'go_referrers_mode', 'gopls')
+endfunction
+
+function! go#config#ImplementsMode() abort
+ return get(g:, 'go_implements_mode', 'guru')
+endfunction
+
+function! go#config#GoplsCompleteUnimported() abort
+ return get(g:, 'go_gopls_complete_unimported', v:null)
+endfunction
+
+function! go#config#GoplsDeepCompletion() abort
+ return get(g:, 'go_gopls_deep_completion', v:null)
+endfunction
+
+function! go#config#GoplsMatcher() abort
+ if !exists('g:go_gopls_matcher') && get(g:, 'g:go_gopls_fuzzy_matching', v:null) is 1
+ return 'fuzzy'
+ endif
+ return get(g:, 'go_gopls_matcher', v:null)
+endfunction
+
+function! go#config#GoplsStaticCheck() abort
+ return get(g:, 'go_gopls_staticcheck', v:null)
+endfunction
+
+function! go#config#GoplsUsePlaceholders() abort
+ return get(g:, 'go_gopls_use_placeholders', v:null)
+endfunction
+
+function! go#config#GoplsTempModfile() abort
+ return get(g:, 'go_gopls_temp_modfile', v:null)
+endfunction
+
+function! go#config#GoplsAnalyses() abort
+ return get(g:, 'go_gopls_analyses', v:null)
+endfunction
+
+function! go#config#GoplsLocal() abort
+ return get(g:, 'go_gopls_local', v:null)
+endfunction
+
+function! go#config#GoplsGofumpt() abort
+ return get(g:, 'go_gopls_gofumpt', v:null)
+endfunction
+
+function! go#config#GoplsSettings() abort
+ return get(g:, 'go_gopls_settings', v:null)
+endfunction
+
+function! go#config#GoplsEnabled() abort
+ return get(g:, 'go_gopls_enabled', 1)
+endfunction
+
+function! go#config#DiagnosticsEnabled() abort
+ return get(g:, 'go_diagnostics_enabled', 0)
+endfunction
+
+function! go#config#GoplsOptions() abort
+ return get(g:, 'go_gopls_options', ['-remote=auto'])
+endfunction
+
" Set the default value. A value of "1" is a shortcut for this, for
" compatibility reasons.
if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1
diff --git a/pack/acp/start/vim-go/autoload/go/config_test.vim b/pack/acp/start/vim-go/autoload/go/config_test.vim
new file mode 100644
index 0000000..6ac3eed
--- /dev/null
+++ b/pack/acp/start/vim-go/autoload/go/config_test.vim
@@ -0,0 +1,107 @@
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+scriptencoding utf-8
+
+func! Test_SetBuildTags() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_def_mode = 'gopls'
+ let l:dir = 'test-fixtures/config/buildtags'
+ let l:jumpstart = [0, 4, 2, 0]
+
+ execute 'e ' . printf('%s/buildtags.go', l:dir)
+ let l:jumpstartbuf = bufnr('')
+
+ call setpos('.', [l:jumpstartbuf, l:jumpstart[1], l:jumpstart[2], 0])
+
+ let l:expectedfilename = printf('%s/foo.go', l:dir)
+
+ let l:expected = [0, 5, 1, 0]
+ call assert_notequal(l:expected, l:jumpstart)
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expectedfilename, bufname("%"))
+ call assert_equal(l:expected, getpos('.'))
+
+ execute 'e ' . printf('%s/buildtags.go', l:dir)
+
+ " prepare to wait for the workspace/configuration request
+ let g:go_debug=['lsp']
+
+ " set the build constraint
+ call go#config#SetBuildTags('constrained')
+
+ " wait for the workspace/configuration request
+ let l:lsplog = getbufline('__GOLSP_LOG__', 1, '$')
+ let l:start = reltime()
+ while match(l:lsplog, 'workspace/configuration') == -1 && reltimefloat(reltime(l:start)) < 10
+ sleep 50m
+ let l:lsplog = getbufline('__GOLSP_LOG__', 1, '$')
+ endwhile
+ unlet g:go_debug
+ " close the __GOLSP_LOG__ window
+ only
+
+ " verify the cursor position within buildtags.go
+ call setpos('.', [l:jumpstartbuf, l:jumpstart[1], l:jumpstart[2], 0])
+ call assert_equal(l:jumpstart, getpos('.'))
+
+ let l:expectedfilename = printf('%s/constrainedfoo.go', l:dir)
+ let l:expected = [0, 6, 1, 0]
+ call assert_notequal(l:expected, l:jumpstart)
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expectedfilename, bufname("%"))
+ call assert_equal(l:expected, getpos('.'))
+
+ let l:lsplog = getbufline('__GOLSP_LOG__', 1, '$')
+
+ finally
+ call go#config#SetBuildTags('')
+ unlet g:go_def_mode
+ endtry
+endfunc
+
+func! Test_GoplsEnabled_Clear() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_gopls_enabled = 0
+
+ let l:tmp = gotest#write_file('gopls_disabled.go', [
+ \ 'package example',
+ \ '',
+ \ 'func Example() {',
+ \ "\tprintln(" . '"hello, world!")',
+ \ '}',
+ \ ] )
+
+ finally
+ unlet g:go_gopls_enabled
+ call delete(l:tmp, 'rf')
+ endtry
+endfunc
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2 ts=2 et
diff --git a/pack/acp/start/vim-go/autoload/go/coverage.vim b/pack/acp/start/vim-go/autoload/go/coverage.vim
index 50d4df1..01456e5 100644
--- a/pack/acp/start/vim-go/autoload/go/coverage.vim
+++ b/pack/acp/start/vim-go/autoload/go/coverage.vim
@@ -25,10 +25,10 @@ endfunction
" the code. Calling it again reruns the tests and shows the last updated
" coverage.
function! go#coverage#Buffer(bang, ...) abort
- " we use matchaddpos() which was introduce with 7.4.330, be sure we have
- " it: http://ftp.vim.org/vim/patches/7.4/7.4.330
+
+ " check if the version of Vim being tested supports matchaddpos()
if !exists("*matchaddpos")
- call go#util#EchoError("GoCoverage is supported with Vim version 7.4-330 or later")
+ call go#util#EchoError("GoCoverage is not supported by your version of Vim.")
return -1
endif
diff --git a/pack/acp/start/vim-go/autoload/go/debug.vim b/pack/acp/start/vim-go/autoload/go/debug.vim
index 1d11301..abe7144 100644
--- a/pack/acp/start/vim-go/autoload/go/debug.vim
+++ b/pack/acp/start/vim-go/autoload/go/debug.vim
@@ -6,14 +6,15 @@ scriptencoding utf-8
if !exists('s:state')
let s:state = {
- \ 'rpcid': 1,
- \ 'running': 0,
- \ 'currentThread': {},
- \ 'localVars': {},
- \ 'functionArgs': {},
- \ 'message': [],
- \ 'is_test': 0,
- \}
+ \ 'rpcid': 1,
+ \ 'running': 0,
+ \ 'currentThread': {},
+ \ 'localVars': {},
+ \ 'functionArgs': {},
+ \ 'message': [],
+ \ 'resultHandlers': {},
+ \ 'kill_on_detach': v:true,
+ \ }
if go#util#HasDebug('debugger-state')
call go#config#SetDebugDiag(s:state)
@@ -24,7 +25,7 @@ if !exists('s:start_args')
let s:start_args = []
endif
-function! s:groutineID() abort
+function! s:goroutineID() abort
return s:state['currentThread'].goroutineID
endfunction
@@ -81,15 +82,23 @@ function! s:logger(prefix, ch, msg) abort
endtry
endfunction
-function! s:call_jsonrpc(method, ...) abort
+" s:call_jsonrpc will call method, passing all of s:call_jsonrpc's optional
+" arguments in the rpc request's params field.
+
+" The first argument to s:call_jsonrpc should be a function that takes two
+" arguments. The first argument will be a function that takes no arguments and will
+" throw an exception if the response to the request is an error response. The
+" second argument is the response itself.
+function! s:call_jsonrpc(handle_result, method, ...) abort
if go#util#HasDebug('debugger-commands')
- echom 'sending to dlv ' . a:method
+ call go#util#EchoInfo('sending to dlv ' . a:method)
endif
let l:args = a:000
let s:state['rpcid'] += 1
+ let l:reqid = s:state['rpcid']
let l:req_json = json_encode({
- \ 'id': s:state['rpcid'],
+ \ 'id': l:reqid,
\ 'method': a:method,
\ 'params': l:args,
\})
@@ -98,36 +107,33 @@ function! s:call_jsonrpc(method, ...) abort
let l:ch = s:state['ch']
if has('nvim')
call chansend(l:ch, l:req_json)
- while len(s:state.data) == 0
- sleep 50m
- if get(s:state, 'ready', 0) == 0
- return
- endif
- endwhile
- let resp_json = s:state.data[0]
- let s:state.data = s:state.data[1:]
else
call ch_sendraw(l:ch, req_json)
- let l:resp_raw = ch_readraw(l:ch)
- let resp_json = json_decode(l:resp_raw)
endif
+ let s:state.resultHandlers[l:reqid] = a:handle_result
+
if go#util#HasDebug('debugger-commands')
let g:go_debug_commands = add(go#config#DebugCommands(), {
\ 'request': l:req_json,
- \ 'response': l:resp_json,
\ })
endif
- if type(l:resp_json) == v:t_dict && has_key(l:resp_json, 'error') && !empty(l:resp_json.error)
- throw l:resp_json.error
- endif
- return l:resp_json
+ redraw
catch
throw substitute(v:exception, '^Vim', '', '')
endtry
endfunction
+function! s:exited(res) abort
+ if type(a:res) ==# type(v:null)
+ return 0
+ endif
+
+ let state = a:res.result.State
+ return state.exited == v:true
+endfunction
+
" Update the location of the current breakpoint or line we're halted on based on
" response from dlv.
function! s:update_breakpoint(res) abort
@@ -155,13 +161,23 @@ function! s:update_breakpoint(res) abort
endif
silent! exe 'norm!' linenr.'G'
silent! normal! zvzz
+ " TODO(bc): convert to use s:sign_unplace()
silent! sign unplace 9999
+ " TODO(bc): convert to use s:sign_place()
silent! exe 'sign place 9999 line=' . linenr . ' name=godebugcurline file=' . filename
+ call s:warn_when_stale(fnamemodify(l:filename, ':p'))
endfunction
" Populate the stacktrace window.
-function! s:show_stacktrace(res) abort
- if !has_key(a:res, 'result')
+function! s:show_stacktrace(check_errors, res) abort
+ try
+ call a:check_errors()
+ catch
+ call go#util#EchoError(printf('could not update stack: %s', v:exception))
+ return
+ endtry
+
+ if type(a:res) isnot type({}) || !has_key(a:res, 'result') || empty(a:res.result)
return
endif
@@ -178,6 +194,9 @@ function! s:show_stacktrace(res) abort
silent %delete _
for i in range(len(a:res.result.Locations))
let loc = a:res.result.Locations[i]
+ if loc.file is# '?' || !has_key(loc, 'function')
+ continue
+ endif
call setline(i+1, printf('%s - %s:%d', loc.function.name, fnamemodify(loc.file, ':p'), loc.line))
endfor
finally
@@ -224,6 +243,7 @@ function! s:show_variables() abort
endfunction
function! s:clearState() abort
+ let s:state['running'] = 0
let s:state['currentThread'] = {}
let s:state['localVars'] = {}
let s:state['functionArgs'] = {}
@@ -233,7 +253,7 @@ function! s:clearState() abort
endfunction
function! s:stop() abort
- let l:res = s:call_jsonrpc('RPCServer.Detach', {'kill': v:true})
+ call s:call_jsonrpc(function('s:noop'), 'RPCServer.Detach', {'kill': s:state['kill_on_detach']})
if has_key(s:state, 'job')
call go#job#Wait(s:state['job'])
@@ -260,8 +280,9 @@ function! go#debug#Stop() abort
for k in map(split(execute('command GoDebug'), "\n")[1:], 'matchstr(v:val, "^\\s*\\zs\\S\\+")')
exe 'delcommand' k
endfor
- command! -nargs=* -complete=customlist,go#package#Complete GoDebugStart call go#debug#Start(0, )
- command! -nargs=* -complete=customlist,go#package#Complete GoDebugTest call go#debug#Start(1, )
+ command! -nargs=* -complete=customlist,go#package#Complete GoDebugStart call go#debug#Start('debug', )
+ command! -nargs=* -complete=customlist,go#package#Complete GoDebugTest call go#debug#Start('test', )
+ command! -nargs=1 GoDebugAttach call go#debug#Start('attach', )
command! -nargs=? GoDebugBreakpoint call go#debug#Breakpoint()
" Remove all mappings.
@@ -280,6 +301,7 @@ function! go#debug#Stop() abort
silent! exe bufwinnr(bufnr('__GODEBUG_STACKTRACE__')) 'wincmd c'
silent! exe bufwinnr(bufnr('__GODEBUG_VARIABLES__')) 'wincmd c'
silent! exe bufwinnr(bufnr('__GODEBUG_OUTPUT__')) 'wincmd c'
+ silent! exe bufwinnr(bufnr('__GODEBUG_GOROUTINES__')) 'wincmd c'
if has('balloon_eval')
let &ballooneval=s:ballooneval
@@ -326,10 +348,10 @@ endfunction
function! s:expand_var() abort
" Get name from struct line.
- let name = matchstr(getline('.'), '^[^:]\+\ze: [a-zA-Z0-9\.·]\+{\.\.\.}$')
+ let name = matchstr(getline('.'), '^[^:]\+\ze: \*\?[a-zA-Z0-9-_/\.]\+\({\.\.\.}\)\?$')
" Anonymous struct
if name == ''
- let name = matchstr(getline('.'), '^[^:]\+\ze: struct {.\{-}}$')
+ let name = matchstr(getline('.'), '^[^:]\+\ze: \*\?struct {.\{-}}$')
endif
if name != ''
@@ -419,23 +441,6 @@ function! s:start_cb() abort
endif
let debugwindows = go#config#DebugWindows()
- if has_key(debugwindows, "stack") && debugwindows['stack'] != ''
- exe 'silent ' . debugwindows['stack']
- silent file `='__GODEBUG_STACKTRACE__'`
- setlocal buftype=nofile bufhidden=wipe nomodified nobuflisted noswapfile nowrap nonumber nocursorline
- setlocal filetype=godebugstacktrace
- nmap :call goto_file()
- nmap q (go-debug-stop)
- endif
-
- if has_key(debugwindows, "out") && debugwindows['out'] != ''
- exe 'silent ' . debugwindows['out']
- silent file `='__GODEBUG_OUTPUT__'`
- setlocal buftype=nofile bufhidden=wipe nomodified nobuflisted noswapfile nowrap nonumber nocursorline
- setlocal filetype=godebugoutput
- nmap q (go-debug-stop)
- endif
-
if has_key(debugwindows, "vars") && debugwindows['vars'] != ''
exe 'silent ' . debugwindows['vars']
silent file `='__GODEBUG_VARIABLES__'`
@@ -446,24 +451,66 @@ function! s:start_cb() abort
nmap q (go-debug-stop)
endif
+ if has_key(debugwindows, "stack") && debugwindows['stack'] != ''
+ exe 'silent ' . debugwindows['stack']
+ silent file `='__GODEBUG_STACKTRACE__'`
+ setlocal buftype=nofile bufhidden=wipe nomodified nobuflisted noswapfile nowrap nonumber nocursorline
+ setlocal filetype=godebugstacktrace
+ nmap :call goto_file()
+ nmap q (go-debug-stop)
+ endif
+
+ if has_key(debugwindows, "goroutines") && debugwindows['goroutines'] != ''
+ exe 'silent ' . debugwindows['goroutines']
+ silent file `='__GODEBUG_GOROUTINES__'`
+ setlocal buftype=nofile bufhidden=wipe nomodified nobuflisted noswapfile nowrap nonumber nocursorline
+ setlocal filetype=godebugvariables
+ call append(0, ["# Goroutines"])
+ nmap :call go#debug#Goroutine()
+ endif
+
+ if has_key(debugwindows, "out") && debugwindows['out'] != ''
+ exe 'silent ' . debugwindows['out']
+ silent file `='__GODEBUG_OUTPUT__'`
+ setlocal buftype=nofile bufhidden=wipe nomodified nobuflisted noswapfile nowrap nonumber nocursorline
+ setlocal filetype=godebugoutput
+ nmap q (go-debug-stop)
+ endif
+ call win_gotoid(l:winid)
+
silent! delcommand GoDebugStart
silent! delcommand GoDebugTest
+ silent! delcommand GoDebugAttach
+
command! -nargs=0 GoDebugContinue call go#debug#Stack('continue')
+ command! -nargs=0 GoDebugStop call go#debug#Stop()
+
+ nnoremap (go-debug-breakpoint) :call go#debug#Breakpoint()
+ nnoremap (go-debug-continue) :call go#debug#Stack('continue')
+ nnoremap (go-debug-stop) :call go#debug#Stop()
+
+ augroup vim-go-debug
+ autocmd! *
+ autocmd FileType go nmap (go-debug-continue)
+ autocmd FileType go nmap (go-debug-breakpoint)
+ augroup END
+ doautocmd vim-go-debug FileType go
+endfunction
+
+function! s:continue()
command! -nargs=0 GoDebugNext call go#debug#Stack('next')
command! -nargs=0 GoDebugStep call go#debug#Stack('step')
command! -nargs=0 GoDebugStepOut call go#debug#Stack('stepOut')
command! -nargs=0 GoDebugRestart call go#debug#Restart()
- command! -nargs=0 GoDebugStop call go#debug#Stop()
command! -nargs=* GoDebugSet call go#debug#Set()
command! -nargs=1 GoDebugPrint call go#debug#Print()
+ command! -nargs=0 GoDebugHalt call go#debug#Stack('halt')
- nnoremap (go-debug-breakpoint) :call go#debug#Breakpoint()
nnoremap (go-debug-next) :call go#debug#Stack('next')
nnoremap (go-debug-step) :call go#debug#Stack('step')
- nnoremap (go-debug-stepout) :call go#debug#Stack('stepout')
- nnoremap (go-debug-continue) :call go#debug#Stack('continue')
- nnoremap (go-debug-stop) :call go#debug#Stop()
+ nnoremap (go-debug-stepout) :call go#debug#Stack('stepOut')
nnoremap (go-debug-print) :call go#debug#Print(expand(''))
+ nnoremap (go-debug-halt) :call go#debug#Stack('halt')
if has('balloon_eval')
let s:balloonexpr=&balloonexpr
@@ -473,8 +520,6 @@ function! s:start_cb() abort
set ballooneval
endif
- call win_gotoid(l:winid)
-
augroup vim-go-debug
autocmd! *
autocmd FileType go nmap (go-debug-continue)
@@ -482,13 +527,14 @@ function! s:start_cb() abort
autocmd FileType go nmap (go-debug-breakpoint)
autocmd FileType go nmap (go-debug-next)
autocmd FileType go nmap (go-debug-step)
+ autocmd FileType go nmap (go-debug-halt)
augroup END
doautocmd vim-go-debug FileType go
endfunction
function! s:err_cb(ch, msg) abort
if get(s:state, 'ready', 0) != 0
- call call('s:logger', ['ERR: ', a:ch, a:msg])
+ call s:logger('ERR: ', a:ch, a:msg)
return
endif
@@ -497,20 +543,21 @@ endfunction
function! s:out_cb(ch, msg) abort
if get(s:state, 'ready', 0) != 0
- call call('s:logger', ['OUT: ', a:ch, a:msg])
+ call s:logger('OUT: ', a:ch, a:msg)
return
endif
let s:state['message'] += [a:msg]
if stridx(a:msg, go#config#DebugAddress()) != -1
+ let s:state['data'] = []
+ let l:state = {'databuf': ''}
+
+ " explicitly bind callback to state so that within it, self will
+ " always refer to state. See :help Partial for more information.
+ let l:state.on_data = function('s:on_data', [], l:state)
+
if has('nvim')
- let s:state['data'] = []
- let l:state = {'databuf': ''}
-
- " explicitly bind callback to state so that within it, self will
- " always refer to state. See :help Partial for more information.
- let l:state.on_data = function('s:on_data', [], l:state)
let l:ch = sockconnect('tcp', go#config#DebugAddress(), {'on_data': l:state.on_data, 'state': l:state})
if l:ch == 0
call go#util#EchoError("could not connect to debugger")
@@ -518,7 +565,7 @@ function! s:out_cb(ch, msg) abort
return
endif
else
- let l:ch = ch_open(go#config#DebugAddress(), {'mode': 'raw', 'timeout': 20000})
+ let l:ch = ch_open(go#config#DebugAddress(), {'mode': 'raw', 'timeout': 20000, 'callback': l:state.on_data})
if ch_status(l:ch) !=# 'open'
call go#util#EchoError("could not connect to debugger")
call go#job#Stop(s:state['job'])
@@ -534,9 +581,8 @@ function! s:out_cb(ch, msg) abort
let s:state['ready'] = 1
" replace all the breakpoints set before delve started so that the ids won't overlap.
- let l:breakpoints = s:list_breakpoints()
for l:bt in s:list_breakpoints()
- exe 'sign unplace '. l:bt.id
+ call s:sign_unplace(l:bt.id, l:bt.file)
call go#debug#Breakpoint(l:bt.line, l:bt.file)
endfor
@@ -544,27 +590,108 @@ function! s:out_cb(ch, msg) abort
endif
endfunction
-function! s:on_data(ch, data, event) dict abort
- let l:data = self.databuf
- for l:msg in a:data
- let l:data .= l:msg
- endfor
+" s:on_data's third optional argument is provided, but not used, so that the
+" same function can be used for Vim's 'callback' and Neovim's 'data'.
+function! s:on_data(ch, data, ...) dict abort
+ let l:data = s:message(self.databuf, a:data)
+ let l:messages = split(l:data, "\n")
+ for l:msg in l:messages
+ let l:data = l:messages[0]
+ try
+ let l:res = json_decode(l:data)
+ " remove the decoded message
+ call remove(l:messages, 0)
+ catch
+ return
+ finally
+ " Rejoin messages and assign to databuf so that any messages that come
+ " in if s:handleRPCResult sleeps will be appended correctly.
+ "
+ " Because the current message is removed in the try immediately after
+ " decoding, that l:messages contains all the messages that have not
+ " yet been decoded including the current message if decoding it
+ " failed.
+ let self.databuf = join(l:messages, "\n")
+ endtry
+
+ if go#util#HasDebug('debugger-commands')
+ let g:go_debug_commands = add(go#config#DebugCommands(), {
+ \ 'response': l:data,
+ \ })
+ endif
+ call s:handleRPCResult(l:res)
+ endfor
+endfunction
+
+function! s:message(buf, data) abort
+ if has('nvim')
+ " dealing with the channel lines of Neovim is awful. The docs (:help
+ " channel-lines) say:
+ " stream event handlers may receive partial (incomplete) lines. For a
+ " given invocation of on_stdout etc, `a:data` is not guaranteed to end
+ " with a newline.
+ " - `abcdefg` may arrive as `['abc']`, `['defg']`.
+ " - `abc\nefg` may arrive as `['abc', '']`, `['efg']` or `['abc']`,
+ " `['','efg']`, or even `['ab']`, `['c','efg']`.
+ "
+ " Thankfully, though, this is explained a bit better in an issue:
+ " https://github.com/neovim/neovim/issues/3555. Specifically in these two
+ " comments:
+ " * https://github.com/neovim/neovim/issues/3555#issuecomment-152290804
+ " * https://github.com/neovim/neovim/issues/3555#issuecomment-152588749
+ "
+ " The key is
+ " Every item in the list passed to job control callbacks represents a
+ " string after a newline(Except the first, of course). If the program
+ " outputs: "hello\nworld" the corresponding list is ["hello", "world"].
+ " If the program outputs "hello\nworld\n", the corresponding list is
+ " ["hello", "world", ""]. In other words, you can always determine if
+ " the last line received is complete or not.
+ " and
+ " for every list you receive in a callback, all items except the first
+ " represent newlines.
+
+ let l:data = printf('%s%s', a:buf, a:data[0])
+ for l:msg in a:data[1:]
+ let l:data = printf("%s\n%s", l:data, l:msg)
+ endfor
+
+ return l:data
+ endif
+
+ return printf('%s%s', a:buf, a:data)
+endfunction
+
+" s:check_errors will be curried and injected into rpc result handlers so that
+" those result handlers can consistently check for errors in the response by
+" catching exceptions and handling the error appropriately.
+function! s:check_errors(resp_json) abort
+ if type(a:resp_json) == v:t_dict && has_key(a:resp_json, 'error') && !empty(a:resp_json.error)
+ throw a:resp_json.error
+ endif
+endfunction
+
+function! s:handleRPCResult(resp) abort
try
- let l:res = json_decode(l:data)
- let s:state['data'] = add(s:state['data'], l:res)
- let self.databuf = ''
+ let l:id = a:resp.id
+ " call the result handler with its first argument set to a curried
+ " s:check_errors value so that the result handler can call s:check_errors
+ " without passing any arguments to check whether the response is an error
+ " response.
+ call call(s:state.resultHandlers[l:id], [function('s:check_errors', [a:resp]), a:resp])
catch
- " there isn't a complete message in databuf: buffer l:data and try
- " again when more data comes in.
- let self.databuf = l:data
+ throw v:exception
finally
+ if has_key(s:state.resultHandlers, l:id)
+ call remove(s:state.resultHandlers, l:id)
+ endif
endtry
endfunction
" Start the debug mode. The first argument is the package name to compile and
" debug, anything else will be passed to the running program.
-function! go#debug#Start(is_test, ...) abort
+function! go#debug#Start(mode, ...) abort
call go#cmd#autowrite()
if !go#util#has_job()
@@ -577,7 +704,7 @@ function! go#debug#Start(is_test, ...) abort
return s:state['job']
endif
- let s:start_args = a:000
+ let s:start_args = [a:mode] + a:000
if go#util#HasDebug('debugger-state')
call go#config#SetDebugDiag(s:state)
@@ -589,39 +716,21 @@ function! go#debug#Start(is_test, ...) abort
endif
try
- if len(a:000) > 0
- let l:pkgname = a:1
- if l:pkgname[0] == '.'
- let l:pkgname = go#package#FromPath(l:pkgname)
- endif
+
+ let l:cmd = [dlv, a:mode]
+
+ let s:state['kill_on_detach'] = v:true
+ if a:mode is 'debug' || a:mode is 'test'
+ let l:cmd = extend(l:cmd, s:package(a:000))
+ let l:cmd = extend(l:cmd, ['--output', tempname()])
+ elseif a:mode is 'attach'
+ let l:cmd = add(l:cmd, a:1)
+ let s:state['kill_on_detach'] = v:false
else
- let l:pkgname = go#package#FromPath(getcwd())
+ call go#util#EchoError('Unknown dlv command')
endif
- if l:pkgname is -1
- call go#util#EchoError('could not determine package name')
- return
- endif
-
- " cd in to test directory; this is also what running "go test" does.
- if a:is_test
- " TODO(bc): Either remove this if it's ok to do so or else record it and
- " reset cwd after the job completes.
- lcd %:p:h
- endif
-
- let s:state.is_test = a:is_test
-
- let l:args = []
- if len(a:000) > 1
- let l:args = ['--'] + a:000[1:]
- endif
-
- let l:cmd = [
- \ dlv,
- \ (a:is_test ? 'test' : 'debug'),
- \ l:pkgname,
- \ '--output', tempname(),
+ let l:cmd += [
\ '--headless',
\ '--api-version', '2',
\ '--listen', go#config#DebugAddress(),
@@ -635,7 +744,10 @@ function! go#debug#Start(is_test, ...) abort
if buildtags isnot ''
let l:cmd += ['--build-flags', '--tags=' . buildtags]
endif
- let l:cmd += l:args
+
+ if len(a:000) > 1
+ let l:cmd += ['--'] + a:000[1:]
+ endif
let s:state['message'] = []
let l:opts = {
@@ -650,13 +762,46 @@ function! go#debug#Start(is_test, ...) abort
let s:state['job'] = go#job#Start(l:cmd, l:opts)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not start debugger: %s', v:exception))
endtry
return s:state['job']
endfunction
-" Translate a reflect kind constant to a human string.
+" s:package returns the import path of package name of a :GoDebug(Start|Test)
+" call as a list so that the package can be appended to a command list using
+" extend(). args is expected to be a (potentially empty_ list. The first
+" element in args (if there are any) is expected to be a package path. An
+" emnpty list is returned when either args is an empty list or the import path
+" cannot be determined.
+function! s:package(args)
+ if len(a:args) == 0
+ return []
+ endif
+
+ " append the package when it's given.
+ let l:pkgname = a:args[0]
+ if l:pkgname[0] == '.'
+ let l:pkgabspath = fnamemodify(l:pkgname, ':p')
+
+ let l:cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+ let l:dir = getcwd()
+ let l:dir = go#util#Chdir(expand('%:p:h'))
+ try
+ let l:pkgname = go#package#FromPath(l:pkgabspath)
+ if type(l:pkgname) == type(0)
+ call go#util#EchoError('could not determine package name')
+ return []
+ endif
+ finally
+ call go#util#Chdir(l:dir)
+ endtry
+ endif
+
+ return [l:pkgname]
+endfunction
+
+ " Translate a reflect kind constant to a human string.
function! s:reflect_kind(k)
" Kind constants from Go's reflect package.
return [
@@ -746,18 +891,25 @@ endfunction
function! s:eval(arg) abort
try
- let l:res = s:call_jsonrpc('RPCServer.State')
- let l:res = s:call_jsonrpc('RPCServer.Eval', {
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.State')
+ let l:res = l:promise.await()
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.Eval', {
\ 'expr': a:arg,
\ 'scope': {'GoroutineID': l:res.result.State.currentThread.goroutineID}
\ })
+
+ let l:res = l:promise.await()
+
return s:eval_tree(l:res.result.Variable, 0)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('evaluation failed: %s', v:exception))
return ''
endtry
endfunction
+
function! go#debug#BalloonExpr() abort
silent! let l:v = s:eval(v:beval_text)
return l:v
@@ -767,7 +919,106 @@ function! go#debug#Print(arg) abort
try
echo substitute(s:eval(a:arg), "\n$", "", 0)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not print: %s', v:exception))
+ endtry
+endfunction
+
+function! s:update_goroutines() abort
+ call s:call_jsonrpc(function('s:update_goroutines_state_handler'), 'RPCServer.State')
+endfunction
+
+function! s:update_goroutines_state_handler(check_errors, res) abort
+ try
+ call a:check_errors()
+
+ let l:currentGoroutineID = 0
+ try
+ if type(a:res) is type({}) && has_key(a:res, 'result') && !empty(a:res['result'])
+ let l:currentGoroutineID = a:res["result"]["State"]["currentGoroutine"]["id"]
+ endif
+ catch
+ call go#util#EchoWarning("current goroutine not found...")
+ endtry
+
+ call s:call_jsonrpc(function('s:list_goroutines_handler', [l:currentGoroutineID]), 'RPCServer.ListGoroutines')
+ catch
+ call go#util#EchoError(printf('could not list goroutines: %s', v:exception))
+ endtry
+endfunction
+
+function s:list_goroutines_handler(currentGoroutineID, check_errors, res) abort
+ try
+ call a:check_errors()
+ call s:show_goroutines(a:currentGoroutineID, a:res)
+ catch
+ call go#util#EchoError(printf('could not show goroutines: %s', v:exception))
+ endtry
+endfunction
+
+function! s:show_goroutines(currentGoroutineID, res) abort
+ let l:goroutines_winid = bufwinid('__GODEBUG_GOROUTINES__')
+ if l:goroutines_winid == -1
+ return
+ endif
+
+ let l:winid = win_getid()
+ call win_gotoid(l:goroutines_winid)
+
+ try
+ setlocal modifiable
+ silent %delete _
+
+ let v = ['# Goroutines']
+
+ if type(a:res) isnot type({}) || !has_key(a:res, 'result') || empty(a:res['result'])
+ call setline(1, v)
+ return
+ endif
+
+ let l:goroutines = a:res["result"]["Goroutines"]
+ if len(l:goroutines) == 0
+ call go#util#EchoWarning("No Goroutines Running Now...")
+ call setline(1, v)
+ return
+ endif
+
+ for l:idx in range(len(l:goroutines))
+ let l:goroutine = l:goroutines[l:idx]
+ let l:goroutineType = ""
+ let l:loc = 0
+ if l:goroutine.startLoc.file != ""
+ let l:loc = l:goroutine.startLoc
+ let l:goroutineType = "Start"
+ endif
+ if l:goroutine.goStatementLoc.file != ""
+ let l:loc = l:goroutine.goStatementLoc
+ let l:goroutineType = "Go"
+ endif
+ if l:goroutine.currentLoc.file != ""
+ let l:loc = l:goroutine.currentLoc
+ let l:goroutineType = "Runtime"
+ endif
+ if l:goroutine.userCurrentLoc.file != ""
+ let l:loc=l:goroutine.userCurrentLoc
+ let l:goroutineType = "User"
+ endif
+
+ " The current goroutine can be changed by pressing enter on one of the
+ " lines listing a non-active goroutine. If the format of either of these
+ " lines is modified, then make sure that go#debug#Goroutine is also
+ " changed if needed.
+ if l:goroutine.id == a:currentGoroutineID
+ let l:g = printf("* Goroutine %s - %s: %s:%s %s (thread: %s)", l:goroutine.id, l:goroutineType, l:loc.file, l:loc.line, l:loc.function.name, l:goroutine.threadID)
+ else
+ let l:g = printf(" Goroutine %s - %s: %s:%s %s (thread: %s)", l:goroutine.id, l:goroutineType, l:loc.file, l:loc.line, l:loc.function.name, l:goroutine.threadID)
+ endif
+ let v += [l:g]
+ endfor
+
+ call setline(1, v)
+ finally
+ setlocal nomodifiable
+ call win_gotoid(l:winid)
endtry
endfunction
@@ -778,22 +1029,47 @@ function! s:update_variables() abort
" MaxArrayValues is the maximum number of elements read from an array, a slice or a map.
" MaxStructFields is the maximum number of fields read from a struct, -1 will read all fields.
let l:cfg = {
- \ 'scope': {'GoroutineID': s:groutineID()},
+ \ 'scope': {'GoroutineID': s:goroutineID()},
\ 'cfg': {'MaxStringLen': 20, 'MaxArrayValues': 20}
\ }
try
- let res = s:call_jsonrpc('RPCServer.ListLocalVars', l:cfg)
- let s:state['localVars'] = res.result['Variables']
+ call s:call_jsonrpc(function('s:handle_list_local_vars'), 'RPCServer.ListLocalVars', l:cfg)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not list variables: %s', v:exception))
endtry
try
- let res = s:call_jsonrpc('RPCServer.ListFunctionArgs', l:cfg)
- let s:state['functionArgs'] = res.result['Args']
+ call s:call_jsonrpc(function('s:handle_list_function_args'), 'RPCServer.ListFunctionArgs', l:cfg)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not list function arguments: %s', v:exception))
+ endtry
+
+endfunction
+
+function! s:handle_list_local_vars(check_errors, res) abort
+ let s:state['localVars'] = {}
+ try
+ call a:check_errors()
+ if type(a:res) is type({}) && has_key(a:res, 'result') && !empty(a:res.result)
+ let s:state['localVars'] = a:res.result['Variables']
+ endif
+ catch
+ call go#util#EchoWarning(printf('could not list variables: %s', v:exception))
+ endtry
+
+ call s:show_variables()
+endfunction
+
+function! s:handle_list_function_args(check_errors, res) abort
+ let s:state['functionArgs'] = {}
+ try
+ call a:check_errors()
+ if type(a:res) is type({}) && has_key(a:res, 'result') && !empty(a:res.result)
+ let s:state['functionArgs'] = a:res.result['Args']
+ endif
+ catch
+ call go#util#EchoWarning(printf('could not list function arguments: %s', v:exception))
endtry
call s:show_variables()
@@ -801,14 +1077,27 @@ endfunction
function! go#debug#Set(symbol, value) abort
try
- let l:res = s:call_jsonrpc('RPCServer.State')
- call s:call_jsonrpc('RPCServer.Set', {
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.State')
+ let l:res = l:promise.await()
+
+ call s:call_jsonrpc(function('s:handle_set'), 'RPCServer.Set', {
\ 'symbol': a:symbol,
\ 'value': a:value,
\ 'scope': {'GoroutineID': l:res.result.State.currentThread.goroutineID}
\ })
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not set symbol value: %s', v:exception))
+ endtry
+
+ call s:update_variables()
+endfunction
+
+function! s:handle_set(check_errors, res) abort
+ try
+ call a:check_errors()
+ catch
+ call go#util#EchoError(printf('could not set symbol value: %s', v:exception))
endtry
call s:update_variables()
@@ -816,20 +1105,25 @@ endfunction
function! s:update_stacktrace() abort
try
- let l:res = s:call_jsonrpc('RPCServer.Stacktrace', {'id': s:groutineID(), 'depth': 5})
- call s:show_stacktrace(l:res)
+ call s:call_jsonrpc(function('s:show_stacktrace'), 'RPCServer.Stacktrace', {'id': s:goroutineID(), 'depth': 5})
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not update stack: %s', v:exception))
endtry
endfunction
function! s:stack_cb(res) abort
let s:stack_name = ''
- if empty(a:res) || !has_key(a:res, 'result')
+ if type(a:res) isnot type({}) || !has_key(a:res, 'result') || empty(a:res.result)
+ return
+ endif
+
+ if s:exited(a:res)
+ call go#debug#Stop()
return
endif
call s:update_breakpoint(a:res)
+ call s:update_goroutines()
call s:update_stacktrace()
call s:update_variables()
endfunction
@@ -844,9 +1138,11 @@ function! go#debug#Stack(name) abort
if s:state.running is 0
let s:state.running = 1
let l:name = 'continue'
+ call s:continue()
endif
" Add a breakpoint to the main.Main if the user didn't define any.
+ " TODO(bc): actually set set the breakpoint in main.Main
if len(s:list_breakpoints()) is 0
if go#debug#Breakpoint() isnot 0
let s:state.running = 0
@@ -855,21 +1151,67 @@ function! go#debug#Stack(name) abort
endif
try
- " TODO: document why this is needed.
+ " s:stack_name is reset in s:stack_cb(). While its value is 'next', the
+ " current operation being performed by delve is a next operation and it
+ " must be cancelled before another next operation can start. See
+ " https://github.com/go-delve/delve/blob/ab5713d3ec5d12754f4b2edf85e4b36a08b67c48/Documentation/api/ClientHowto.md#special-continue-commands-and-asynchronous-breakpoints
+ " for more information.
if l:name is# 'next' && get(s:, 'stack_name', '') is# 'next'
- call s:call_jsonrpc('RPCServer.CancelNext')
+ " use s:rpc_response so that the any errors will be checked instead of
+ " completely discarding the result with s:noop.
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.CancelNext')
+ call l:promise.await()
endif
let s:stack_name = l:name
try
- let res = s:call_jsonrpc('RPCServer.Command', {'name': l:name})
- call s:stack_cb(res)
+ silent! sign unplace 9999
+ call s:call_jsonrpc(function('s:handle_stack_response', [l:name]), 'RPCServer.Command', {'name': l:name})
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('rpc failure: %s', v:exception))
call s:clearState()
+ call go#util#EchoInfo('restarting debugger')
call go#debug#Restart()
endtry
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('CancelNext RPC call failed: %s', v:exception))
+ endtry
+endfunction
+
+function! s:handle_stack_response(command, check_errors, res) abort
+ try
+ call a:check_errors()
+
+ if a:command is# 'next'
+ call s:handleNextInProgress(a:res)
+ endif
+
+ call s:stack_cb(a:res)
+ catch
+ call go#util#EchoError(printf('rpc failure: %s', v:exception))
+ call s:clearState()
+ call go#util#EchoInfo('restarting debugger')
+ call go#debug#Restart()
+ endtry
+endfunction
+
+function! s:handleNextInProgress(res)
+ try
+ let l:res = a:res
+ let l:w = 0
+ while l:w < 1
+ if l:res.result.State.NextInProgress == v:true
+ " TODO(bc): message the user that a breakpoint was hit in a different
+ " goroutine while trying to resume.
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.Command', {'name': 'continue'})
+ let l:res = l:promise.await()
+ else
+ return
+ endif
+ endwhile
+ catch
+ throw v:exception
endtry
endfunction
@@ -880,17 +1222,19 @@ function! go#debug#Restart() abort
call s:stop()
let s:state = {
- \ 'rpcid': 1,
- \ 'running': 0,
- \ 'currentThread': {},
- \ 'localVars': {},
- \ 'functionArgs': {},
- \ 'message': [],
- \}
+ \ 'rpcid': 1,
+ \ 'running': 0,
+ \ 'currentThread': {},
+ \ 'localVars': {},
+ \ 'functionArgs': {},
+ \ 'message': [],
+ \ 'resultHandlers': {},
+ \ 'kill_on_detach': s:state['kill_on_detach'],
+ \ }
call call('go#debug#Start', s:start_args)
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('restart failed: %s', v:exception))
endtry
endfunction
@@ -899,6 +1243,25 @@ function! s:isActive()
return len(s:state['message']) > 0
endfunction
+" Change Goroutine
+function! go#debug#Goroutine() abort
+ let l:goroutineID = str2nr(substitute(getline('.'), '^ Goroutine \(.\{-1,\}\) - .*', '\1', 'g'))
+
+ if l:goroutineID <= 0
+ return
+ endif
+
+ try
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.Command', {'Name': 'switchGoroutine', 'GoroutineID': l:goroutineID})
+ let l:res = l:promise.await()
+ call s:stack_cb(l:res)
+ call go#util#EchoInfo("Switched goroutine to: " . l:goroutineID)
+ catch
+ call go#util#EchoError(printf('could not switch goroutine: %s', v:exception))
+ endtry
+endfunction
+
" Toggle breakpoint. Returns 0 on success and 1 on failure.
function! go#debug#Breakpoint(...) abort
let l:filename = fnamemodify(expand('%'), ':p:gs!\\!/!')
@@ -928,64 +1291,181 @@ function! go#debug#Breakpoint(...) abort
" Remove breakpoint.
if type(l:found) == v:t_dict && !empty(l:found)
- exe 'sign unplace '. l:found.id .' file=' . l:found.file
+ call s:sign_unplace(l:found.id, l:found.file)
if s:isActive()
- let res = s:call_jsonrpc('RPCServer.ClearBreakpoint', {'id': l:found.id})
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.ClearBreakpoint', {'id': l:found.id})
+ let res = l:promise.await()
endif
- " Add breakpoint.
- else
+ else " Add breakpoint
if s:isActive()
- let l:res = s:call_jsonrpc('RPCServer.CreateBreakpoint', {'Breakpoint': {'file': l:filename, 'line': l:linenr}})
- let l:bt = res.result.Breakpoint
- exe 'sign place '. l:bt.id .' line=' . l:bt.line . ' name=godebugbreakpoint file=' . l:bt.file
+ let l:promise = go#promise#New(function('s:rpc_response'), 20000, {})
+ call s:call_jsonrpc(l:promise.wrapper, 'RPCServer.CreateBreakpoint', {'Breakpoint': {'file': l:filename, 'line': l:linenr}})
+ let l:res = l:promise.await()
+ let l:bt = l:res.result.Breakpoint
+ call s:sign_place(l:bt.id, l:bt.file, l:bt.line)
else
let l:id = len(s:list_breakpoints()) + 1
- exe 'sign place ' . l:id . ' line=' . l:linenr . ' name=godebugbreakpoint file=' . l:filename
+ call s:sign_place(l:id, l:filename, l:linenr)
endif
endif
catch
- call go#util#EchoError(v:exception)
+ call go#util#EchoError(printf('could not toggle breakpoint: %s', v:exception))
return 1
endtry
return 0
endfunction
+function! s:sign_unplace(id, file) abort
+ if !exists('*sign_unplace')
+ exe 'sign unplace ' . a:id .' file=' . a:file
+ return
+ endif
+
+ call sign_unplace('vim-go-debug', {'buffer': a:file, 'id': a:id})
+endfunction
+
+function! s:sign_place(id, expr, lnum) abort
+ if !exists('*sign_place')
+ exe 'sign place ' . a:id . ' line=' . a:lnum . ' name=godebugbreakpoint file=' . a:expr
+ return
+ endif
+
+ call sign_place(a:id, 'vim-go-debug', 'godebugbreakpoint', a:expr, {'lnum': a:lnum})
+endfunction
+
function! s:list_breakpoints()
- " :sign place
- " --- Signs ---
- " Signs for a.go:
- " line=15 id=2 name=godebugbreakpoint
- " line=16 id=1 name=godebugbreakpoint
- " Signs for a_test.go:
- " line=6 id=3 name=godebugbreakpoint
-
- let l:signs = []
- let l:file = ''
- for l:line in split(execute('sign place'), '\n')[1:]
- if l:line =~# '^Signs for '
- let l:file = l:line[10:-2]
- continue
- endif
-
- if l:line !~# 'name=godebugbreakpoint'
- continue
- endif
-
- let l:sign = matchlist(l:line, '\vline\=(\d+) +id\=(\d+)')
- call add(l:signs, {
- \ 'id': l:sign[2],
- \ 'file': fnamemodify(l:file, ':p'),
- \ 'line': str2nr(l:sign[1]),
- \ })
+ let l:breakpoints = []
+ let l:signs = s:sign_getplaced()
+ for l:item in l:signs
+ let l:file = fnamemodify(bufname(l:item.bufnr), ':p')
+ for l:sign in l:item.signs
+ call add(l:breakpoints, {
+ \ 'id': l:sign.id,
+ \ 'file': l:file,
+ \ 'line': l:sign.lnum,
+ \ })
+ endfor
endfor
+ return l:breakpoints
+endfunction
+
+function! s:sign_getplaced() abort
+ if !exists('*sign_getplaced') " sign_getplaced was introduced in Vim 8.1.0614
+ " :sign place
+ " --- Signs ---
+ " Signs for a.go:
+ " line=15 id=2 name=godebugbreakpoint
+ " line=16 id=1 name=godebugbreakpoint
+ " Signs for a_test.go:
+ " line=6 id=3 name=godebugbreakpoint
+
+ " l:signs should be the same sam form as the return value for
+ " sign_getplaced(), a list with the following entries:
+ " * bufnr - number of the buffer with the sign
+ " * signs = list of signs placed in bufnr
+ let l:signs = []
+ let l:file = ''
+ for l:line in split(execute('sign place'), '\n')[1:]
+ if l:line =~# '^Signs for '
+ let l:file = l:line[10:-2]
+ continue
+ else
+ " sign place's output may end with Signs instead of starting with Signs.
+ " See
+ " https://github.com/fatih/vim-go/issues/2920#issuecomment-644885774.
+ let l:idx = match(l:line, '\.go .* Signs:$')
+ if l:idx >= 0
+ let l:file = l:line[0:l:idx+2]
+ continue
+ endif
+ endif
+
+ if l:line !~# 'name=godebugbreakpoint'
+ continue
+ endif
+
+ let l:sign = matchlist(l:line, '\vline\=(\d+) +id\=(\d+)')
+ call add(l:signs, {
+ \ 'bufnr': bufnr(l:file),
+ \ 'signs': [{
+ \ 'id': str2nr(l:sign[2]),
+ \ 'lnum': str2nr(l:sign[1]),
+ \ }],
+ \ })
+ endfor
+
+ return l:signs
+ endif
+
+ " it would be nice to use lambda's here, but vim-vimparser currently fails
+ " to parse lamdas as map() arguments.
+ " TODO(bc): return flatten(map(filter(copy(getbufinfo()), { _, val -> val.listed }), { _, val -> sign_getplaced(val.bufnr, {'group': 'vim-go-debug', 'name': 'godebugbreakpoint'})}))
+ let l:bufinfo = getbufinfo()
+ let l:listed = []
+ for l:info in l:bufinfo
+ if l:info.listed
+ let l:listed = add(l:listed, l:info)
+ endif
+ endfor
+
+ let l:signs = []
+ for l:buf in l:listed
+ let l:signs = add(l:signs, sign_getplaced(l:buf.bufnr, {'group': 'vim-go-debug', 'name': 'godebugbreakpoint'})[0])
+ endfor
return l:signs
endfunction
-sign define godebugbreakpoint text=> texthl=GoDebugBreakpoint
+exe 'sign define godebugbreakpoint text='.go#config#DebugBreakpointSignText().' texthl=GoDebugBreakpoint'
sign define godebugcurline text== texthl=GoDebugCurrent linehl=GoDebugCurrent
+" s:rpc_response is a convenience function to check for errors and return
+" a:res when a:res is not an error response.
+function! s:rpc_response(check_errors, res) abort
+ call a:check_errors()
+ return a:res
+endfunction
+
+" s:noop is a noop function. It takes any number of arguments and does
+" nothing.
+function s:noop(...) abort
+endfunction
+
+function! s:warn_when_stale(filename) abort
+ let l:bufinfo = getbufinfo(a:filename)
+ if len(l:bufinfo) == 0
+ return
+ endif
+
+ if l:bufinfo[0].changed
+ call s:warn_stale()
+ return
+ endif
+
+ call s:call_jsonrpc(function('s:handle_staleness_check_response', [fnamemodify(a:filename, ':p')]), 'RPCServer.LastModified')
+endfunction
+
+function! s:handle_staleness_check_response(filename, check_errors, res) abort
+ try
+ call a:check_errors()
+ catch
+ " swallow any errors
+ return
+ endtry
+
+ let l:ftime = strftime('%Y-%m-%dT%H:%M:%S', getftime(a:filename))
+ if l:ftime < a:res.result.Time[0:(len(l:ftime) - 1)]
+ return
+ endif
+ call s:warn_stale(a:filename)
+endfunction
+
+function! s:warn_stale(filename) abort
+ call go#util#EchoWarning(printf('file locations may be incorrect, because %s has changed since debugging started', a:filename))
+endfunction
+
" restore Vi compatibility settings
let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/pack/acp/start/vim-go/autoload/go/debug_test.vim b/pack/acp/start/vim-go/autoload/go/debug_test.vim
index f5572e5..b82f827 100644
--- a/pack/acp/start/vim-go/autoload/go/debug_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/debug_test.vim
@@ -10,6 +10,10 @@ function! Test_GoDebugStart_RelativePackage() abort
call s:debug('./debug/debugmain')
endfunction
+function! Test_GoDebugStart_RelativePackage_NullModule() abort
+ call s:debug('./debug/debugmain', 1)
+endfunction
+
function! Test_GoDebugStart_Package() abort
call s:debug('debug/debugmain')
endfunction
@@ -20,20 +24,21 @@ function! Test_GoDebugStart_Errors() abort
endif
try
+ let l:tmp = gotest#load_fixture('debug/compilerror/main.go')
+
let l:expected = [
\ {'lnum': 0, 'bufnr': 0, 'col': 0, 'valid': 0, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': '# debug/compilerror'},
- \ {'lnum': 6, 'bufnr': 7, 'col': 22, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': ' syntax error: unexpected newline, expecting comma or )'},
+ \ {'lnum': 6, 'bufnr': bufnr('%'), 'col': 22, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': ' syntax error: unexpected newline, expecting comma or )'},
\ {'lnum': 0, 'bufnr': 0, 'col': 0, 'valid': 0, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': 'exit status 2'}
\]
call setqflist([], 'r')
- let l:tmp = gotest#load_fixture('debug/compilerror/main.go')
call assert_false(exists(':GoDebugStop'))
let l:cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
execute l:cd . ' debug/compilerror'
- call go#debug#Start(0)
+ call go#debug#Start('debug')
let l:actual = getqflist()
let l:start = reltime()
@@ -52,14 +57,22 @@ function! Test_GoDebugStart_Errors() abort
endtry
endfunction
+" s:debug takes 2 optional arguments. The first is a package to debug. The
+" second is a flag to indicate whether to reset GOPATH after
+" gotest#load_fixture is called in order to test behavior outside of GOPATH.
function! s:debug(...) abort
if !go#util#has_job()
return
endif
try
+ let $oldgopath = $GOPATH
let l:tmp = gotest#load_fixture('debug/debugmain/debugmain.go')
+ if a:0 > 1 && a:2 == 1
+ let $GOPATH = $oldgopath
+ endif
+
call go#debug#Breakpoint(6)
call assert_false(exists(':GoDebugStop'))
@@ -67,9 +80,9 @@ function! s:debug(...) abort
if a:0 == 0
let l:cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
execute l:cd . ' debug/debugmain'
- let l:job = go#debug#Start(0)
+ let l:job = go#debug#Start('debug')
else
- let l:job = go#debug#Start(0, a:1)
+ let l:job = go#debug#Start('debug', a:1)
endif
let l:start = reltime()
diff --git a/pack/acp/start/vim-go/autoload/go/def.vim b/pack/acp/start/vim-go/autoload/go/def.vim
index 5fa1141..b8c1a9d 100644
--- a/pack/acp/start/vim-go/autoload/go/def.vim
+++ b/pack/acp/start/vim-go/autoload/go/def.vim
@@ -6,7 +6,7 @@ let s:go_stack = []
let s:go_stack_level = 0
function! go#def#Jump(mode, type) abort
- let fname = fnamemodify(expand("%"), ':p:gs?\\?/?')
+ let l:fname = fnamemodify(expand("%"), ':p:gs?\\?/?')
" so guru right now is slow for some people. previously we were using
" godef which also has it's own quirks. But this issue come up so many
@@ -66,7 +66,15 @@ function! go#def#Jump(mode, type) abort
let [l:out, l:err] = go#util#ExecInDir(l:cmd)
endif
elseif bin_name == 'gopls'
- let [l:line, l:col] = getpos('.')[1:2]
+ if !go#config#GoplsEnabled()
+ call go#util#EchoError("go_def_mode is 'gopls', but gopls is disabled")
+ return
+ endif
+
+ " reset l:fname when using gopls so that the filename will be converted to
+ " a URI correctly on windows.
+ let l:fname = expand('%')
+ let [l:line, l:col] = go#lsp#lsp#Position()
" delegate to gopls, with an empty job object and an exit status of 0
" (they're irrelevant for gopls).
if a:type
@@ -162,9 +170,9 @@ function! go#def#jump_to_declaration(out, mode, bin_name) abort
if filename != fnamemodify(expand("%"), ':p:gs?\\?/?')
" jump to existing buffer if, 1. we have enabled it, 2. the buffer is loaded
" and 3. there is buffer window number we switch to
- if go#config#DefReuseBuffer() && bufloaded(filename) != 0 && bufwinnr(filename) != -1
- " jumpt to existing buffer if it exists
- execute bufwinnr(filename) . 'wincmd w'
+ if go#config#DefReuseBuffer() && bufwinnr(filename) != -1
+ " jump to existing buffer if it exists
+ call win_gotoid(bufwinid(filename))
else
if &modified
let cmd = 'hide edit'
@@ -186,7 +194,13 @@ function! go#def#jump_to_declaration(out, mode, bin_name) abort
endif
" open the file and jump to line and column
- exec cmd fnameescape(fnamemodify(filename, ':.'))
+ try
+ exec cmd fnameescape(fnamemodify(filename, ':.'))
+ catch
+ if stridx(v:exception, ':E325:') < 0
+ call go#util#EchoError(v:exception)
+ endif
+ endtry
endif
endif
call cursor(line, col)
diff --git a/pack/acp/start/vim-go/autoload/go/def_test.vim b/pack/acp/start/vim-go/autoload/go/def_test.vim
index a054471..110d8c3 100644
--- a/pack/acp/start/vim-go/autoload/go/def_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/def_test.vim
@@ -2,19 +2,21 @@
let s:cpo_save = &cpo
set cpo&vim
+scriptencoding utf-8
+
func! Test_jump_to_declaration_guru() abort
try
let l:filename = 'def/jump.go'
- let lnum = 5
- let col = 6
+ let l:lnum = 5
+ let l:col = 6
let l:tmp = gotest#load_fixture(l:filename)
- let guru_out = printf("%s:%d:%d: defined here as func main", filename, lnum, col)
- call go#def#jump_to_declaration(guru_out, "", 'guru')
+ let l:guru_out = printf("%s:%d:%d: defined here as func main", l:filename, l:lnum, l:col)
+ call go#def#jump_to_declaration(l:guru_out, "", 'guru')
- call assert_equal(filename, bufname("%"))
- call assert_equal(lnum, getcurpos()[1])
- call assert_equal(col, getcurpos()[2])
+ call assert_equal(l:filename, bufname("%"))
+ call assert_equal(l:lnum, getcurpos()[1])
+ call assert_equal(l:col, getcurpos()[2])
finally
call delete(l:tmp, 'rf')
endtry
@@ -22,17 +24,17 @@ endfunc
func! Test_jump_to_declaration_godef() abort
try
- let filename = 'def/jump.go'
- let lnum = 5
- let col = 6
+ let l:filename = 'def/jump.go'
+ let l:lnum = 5
+ let l:col = 6
let l:tmp = gotest#load_fixture(l:filename)
- let godef_out = printf("%s:%d:%d\ndefined here as func main", filename, lnum, col)
+ let l:godef_out = printf("%s:%d:%d\ndefined here as func main", l:filename, l:lnum, l:col)
call go#def#jump_to_declaration(godef_out, "", 'godef')
- call assert_equal(filename, bufname("%"))
- call assert_equal(lnum, getcurpos()[1])
- call assert_equal(col, getcurpos()[2])
+ call assert_equal(l:filename, bufname("%"))
+ call assert_equal(l:lnum, getcurpos()[1])
+ call assert_equal(l:col, getcurpos()[2])
finally
call delete(l:tmp, 'rf')
endtry
@@ -40,33 +42,180 @@ endfunc
func! Test_Jump_leaves_lists() abort
try
- let filename = 'def/jump.go'
+ let l:filename = 'def/jump.go'
let l:tmp = gotest#load_fixture(l:filename)
- let expected = [{'lnum': 10, 'bufnr': bufnr('%'), 'col': 1, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': 'quux'}]
+ let l:expected = [{'lnum': 10, 'bufnr': bufnr('%'), 'col': 1, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'text': 'quux'}]
- call setloclist(winnr(), copy(expected), 'r' )
- call setqflist(copy(expected), 'r' )
+ call setloclist(0, copy(l:expected), 'r' )
+ call setqflist(copy(l:expected), 'r' )
let l:bufnr = bufnr('%')
call cursor(6, 7)
+
+ if !go#util#has_job()
+ let g:go_def_mode='godef'
+ endif
call go#def#Jump('', 0)
- let start = reltime()
- while bufnr('%') == l:bufnr && reltimefloat(reltime(start)) < 10
+ if !go#util#has_job()
+ unlet g:go_def_mode
+ endif
+
+ let l:start = reltime()
+ while bufnr('%') == l:bufnr && reltimefloat(reltime(l:start)) < 10
sleep 100m
endwhile
- let actual = getloclist(winnr())
- call gotest#assert_quickfix(actual, expected)
+ let l:actual = getloclist(0)
+ call gotest#assert_quickfix(l:actual, l:expected)
- let actual = getqflist()
- call gotest#assert_quickfix(actual, expected)
+ let l:actual = getqflist()
+ call gotest#assert_quickfix(l:actual, l:expected)
finally
call delete(l:tmp, 'rf')
endtry
endfunc
+func! Test_DefJump_gopls_simple_first() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_def_mode = 'gopls'
+
+ let l:tmp = gotest#write_file('simple/firstposition/firstposition.go', [
+ \ 'package firstposition',
+ \ '',
+ \ 'func Example() {',
+ \ "\tid := " . '"foo"',
+ \ "\tprintln(" . '"id:", i d)',
+ \ '}',
+ \ ] )
+
+ let l:expected = [0, 4, 2, 0]
+
+ call assert_notequal(l:expected, getpos('.'))
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expected, getpos('.'))
+ finally
+ call delete(l:tmp, 'rf')
+ unlet g:go_def_mode
+ endtry
+endfunc
+
+func! Test_DefJump_gopls_simple_last() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_def_mode = 'gopls'
+
+ let l:tmp = gotest#write_file('simple/lastposition/lastposition.go', [
+ \ 'package lastposition',
+ \ '',
+ \ 'func Example() {',
+ \ "\tid := " . '"foo"',
+ \ "\tprintln(" . '"id:", id )',
+ \ '}',
+ \ ] )
+
+ let l:expected = [0, 4, 2, 0]
+
+ call assert_notequal(l:expected, getpos('.'))
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expected, getpos('.'))
+ finally
+ call delete(l:tmp, 'rf')
+ unlet g:go_def_mode
+ endtry
+endfunc
+
+func! Test_DefJump_gopls_MultipleCodeUnit_first() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_def_mode = 'gopls'
+
+ let l:tmp = gotest#write_file('multiplecodeunit/firstposition/firstposition.go', [
+ \ 'package firstposition',
+ \ '',
+ \ 'func Example() {',
+ \ "\t𐐀, id := " . '"foo", "bar"',
+ \ "\tprintln(" . '"(𐐀, id):", 𐐀, i d)',
+ \ '}',
+ \ ] )
+
+ let l:expected = [0, 4, 8, 0]
+ call assert_notequal(l:expected, getpos('.'))
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expected, getpos('.'))
+ finally
+ call delete(l:tmp, 'rf')
+ unlet g:go_def_mode
+ endtry
+endfunc
+
+
+func! Test_DefJump_gopls_MultipleCodeUnit_last() abort
+ if !go#util#has_job()
+ return
+ endif
+
+ try
+ let g:go_def_mode = 'gopls'
+
+ let l:tmp = gotest#write_file('multiplecodeunit/lastposition/lastposition.go', [
+ \ 'package lastposition',
+ \ '',
+ \ 'func Example() {',
+ \ "\t𐐀, id := " . '"foo", "bar"',
+ \ "\tprintln(" . '"(𐐀, id):", 𐐀, id )',
+ \ '}',
+ \ ] )
+
+ let l:expected = [0, 4, 8, 0]
+ call assert_notequal(l:expected, getpos('.'))
+
+ call go#def#Jump('', 0)
+
+ let l:start = reltime()
+ while getpos('.') != l:expected && reltimefloat(reltime(l:start)) < 10
+ sleep 100m
+ endwhile
+
+ call assert_equal(l:expected, getpos('.'))
+ finally
+ call delete(l:tmp, 'rf')
+ unlet g:go_def_mode
+ endtry
+endfunc
+
" restore Vi compatibility settings
let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/pack/acp/start/vim-go/autoload/go/doc.vim b/pack/acp/start/vim-go/autoload/go/doc.vim
index 5449bf7..417c231 100644
--- a/pack/acp/start/vim-go/autoload/go/doc.vim
+++ b/pack/acp/start/vim-go/autoload/go/doc.vim
@@ -6,36 +6,25 @@
let s:cpo_save = &cpo
set cpo&vim
+scriptencoding utf-8
+
let s:buf_nr = -1
function! go#doc#OpenBrowser(...) abort
- " check if we have gogetdoc as it gives us more and accurate information.
- " Only supported if we have json_decode as it's not worth to parse the plain
- " non-json output of gogetdoc
- let bin_path = go#path#CheckBinPath('gogetdoc')
- if !empty(bin_path) && exists('*json_decode')
- let [l:json_out, l:err] = s:gogetdoc(1)
+ if len(a:000) == 0
+ let [l:out, l:err] = go#lsp#DocLink()
if l:err
- call go#util#EchoError(json_out)
+ call go#util#EchoError(l:out)
return
endif
- let out = json_decode(json_out)
- if type(out) != type({})
- call go#util#EchoError("gogetdoc output is malformed")
+ if len(l:out) == 0
+ call go#util#EchoWarning("could not path for doc URL")
endif
- let import = out["import"]
- let name = out["name"]
- let decl = out["decl"]
+ let l:godoc_url = printf('%s/%s', go#config#DocUrl(), l:out)
- let godoc_url = go#config#DocUrl()
- let godoc_url .= "/" . import
- if decl !~ "^package"
- let godoc_url .= "#" . name
- endif
-
- call go#util#OpenBrowser(godoc_url)
+ call go#util#OpenBrowser(l:godoc_url)
return
endif
@@ -48,7 +37,7 @@ function! go#doc#OpenBrowser(...) abort
let exported_name = pkgs[1]
" example url: https://godoc.org/github.com/fatih/set#Set
- let godoc_url = go#config#DocUrl() . "/" . pkg . "#" . exported_name
+ let godoc_url = printf('%s/%s#%s', go#config#DocUrl(), pkg, exported_name)
call go#util#OpenBrowser(godoc_url)
endfunction
@@ -56,11 +45,8 @@ function! go#doc#Open(newmode, mode, ...) abort
" With argument: run "godoc [arg]".
if len(a:000)
let [l:out, l:err] = go#util#Exec(['go', 'doc'] + a:000)
- else " Without argument: run gogetdoc on cursor position.
- let [l:out, l:err] = s:gogetdoc(0)
- if out == -1
- return
- endif
+ else " Without argument: use gopls to get documentation
+ let [l:out, l:err] = go#lsp#Doc()
endif
if l:err
@@ -68,10 +54,62 @@ function! go#doc#Open(newmode, mode, ...) abort
return
endif
- call s:GodocView(a:newmode, a:mode, out)
+ call s:GodocView(a:newmode, a:mode, l:out)
endfunction
function! s:GodocView(newposition, position, content) abort
+ " popup window
+ if go#config#DocPopupWindow()
+ if exists('*popup_atcursor') && exists('*popup_clear')
+ call popup_clear()
+
+ let borderchars = ['-', '|', '-', '|', '+', '+', '+', '+']
+ if &encoding == "utf-8"
+ let borderchars = ['─', '│', '─', '│', '┌', '┐', '┘', '└']
+ endif
+ call popup_atcursor(split(a:content, '\n'), {
+ \ 'padding': [1, 1, 1, 1],
+ \ 'borderchars': borderchars,
+ \ 'border': [1, 1, 1, 1],
+ \ })
+ elseif has('nvim') && exists('*nvim_open_win')
+ let lines = split(a:content, '\n')
+ let height = 0
+ let width = 0
+ for line in lines
+ let lw = strdisplaywidth(line)
+ if lw > width
+ let width = lw
+ endif
+ let height += 1
+ endfor
+ let width += 1 " right margin
+ let max_height = go#config#DocMaxHeight()
+ if height > max_height
+ let height = max_height
+ endif
+
+ let buf = nvim_create_buf(v:false, v:true)
+ call nvim_buf_set_lines(buf, 0, -1, v:true, lines)
+ let opts = {
+ \ 'relative': 'cursor',
+ \ 'row': 1,
+ \ 'col': 0,
+ \ 'width': width,
+ \ 'height': height,
+ \ 'style': 'minimal',
+ \ }
+ call nvim_open_win(buf, v:true, opts)
+ setlocal nomodified nomodifiable filetype=godoc
+
+ " close easily with CR, Esc and q
+ noremap :close
+ noremap :close
+ noremap q :close
+ endif
+ return
+ endif
+
" reuse existing buffer window if it exists otherwise create a new one
let is_visible = bufexists(s:buf_nr) && bufwinnr(s:buf_nr) != -1
if !bufexists(s:buf_nr)
@@ -129,23 +167,6 @@ function! s:GodocView(newposition, position, content) abort
nnoremap [ [
endfunction
-function! s:gogetdoc(json) abort
- let l:cmd = [
- \ 'gogetdoc',
- \ '-tags', go#config#BuildTags(),
- \ '-pos', expand("%:p:gs!\\!/!") . ':#' . go#util#OffsetCursor()]
- if a:json
- let l:cmd += ['-json']
- endif
-
- if &modified
- let l:cmd += ['-modified']
- return go#util#Exec(l:cmd, go#util#archive())
- endif
-
- return go#util#Exec(l:cmd)
-endfunction
-
" returns the package and exported name. exported name might be empty.
" ie: fmt and Println
" ie: github.com/fatih/set and New
diff --git a/pack/acp/start/vim-go/autoload/go/fillstruct_test.vim b/pack/acp/start/vim-go/autoload/go/fillstruct_test.vim
index 956cd1e..73ed089 100644
--- a/pack/acp/start/vim-go/autoload/go/fillstruct_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/fillstruct_test.vim
@@ -62,7 +62,7 @@ func! Test_fillstruct_two_line() abort
\ '\tAddress: "",',
\ '}) }'])
finally
- "call delete(l:tmp, 'rf')
+ call delete(l:tmp, 'rf')
endtry
endfunc
diff --git a/pack/acp/start/vim-go/autoload/go/fmt.vim b/pack/acp/start/vim-go/autoload/go/fmt.vim
index 908c0f5..d3a7d92 100644
--- a/pack/acp/start/vim-go/autoload/go/fmt.vim
+++ b/pack/acp/start/vim-go/autoload/go/fmt.vim
@@ -18,6 +18,30 @@ set cpo&vim
" this and have VimL experience, please look at the function for
" improvements, patches are welcome :)
function! go#fmt#Format(withGoimport) abort
+ let l:bin_name = go#config#FmtCommand()
+ if a:withGoimport == 1
+ let l:mode = go#config#ImportsMode()
+ if l:mode == 'gopls'
+ if !go#config#GoplsEnabled()
+ call go#util#EchoError("go_imports_mode is 'gopls', but gopls is disabled")
+ return
+ endif
+ call go#lsp#Imports()
+ return
+ endif
+
+ let l:bin_name = 'goimports'
+ endif
+
+ if l:bin_name == 'gopls'
+ if !go#config#GoplsEnabled()
+ call go#util#EchoError("go_def_mode is 'gopls', but gopls is disabled")
+ return
+ endif
+ call go#lsp#Format()
+ return
+ endif
+
if go#config#FmtExperimental()
" Using winsaveview to save/restore cursor state has the problem of
" closing folds on save:
@@ -52,20 +76,16 @@ function! go#fmt#Format(withGoimport) abort
let l:tmpname = tr(l:tmpname, '\', '/')
endif
- let bin_name = go#config#FmtCommand()
- if a:withGoimport == 1
- let bin_name = "goimports"
- endif
-
let current_col = col('.')
- let [l:out, l:err] = go#fmt#run(bin_name, l:tmpname, expand('%'))
- let diff_offset = len(readfile(l:tmpname)) - line('$')
+ let [l:out, l:err] = go#fmt#run(l:bin_name, l:tmpname, expand('%'))
+ let line_offset = len(readfile(l:tmpname)) - line('$')
+ let l:orig_line = getline('.')
if l:err == 0
call go#fmt#update_file(l:tmpname, expand('%'))
elseif !go#config#FmtFailSilently()
- let errors = s:parse_errors(expand('%'), out)
- call s:show_errors(errors)
+ let l:errors = s:replace_filename(expand('%'), out)
+ call go#fmt#ShowErrors(l:errors)
endif
" We didn't use the temp file, so clean up
@@ -87,8 +107,10 @@ function! go#fmt#Format(withGoimport) abort
call winrestview(l:curw)
endif
- " be smart and jump to the line the new statement was added/removed
- call cursor(line('.') + diff_offset, current_col)
+ " be smart and jump to the line the new statement was added/removed and
+ " adjust the column within the line
+ let l:lineno = line('.') + line_offset
+ call cursor(l:lineno, current_col + (len(getline(l:lineno)) - len(l:orig_line)))
" Syntax highlighting breaks less often.
syntax sync fromstart
@@ -115,28 +137,12 @@ function! go#fmt#update_file(source, target)
" reload buffer to reflect latest changes
silent edit!
+ call go#lsp#DidChange(expand(a:target, ':p'))
+
let &fileformat = old_fileformat
let &syntax = &syntax
- let l:listtype = go#list#Type("GoFmt")
-
- " the title information was introduced with 7.4-2200
- " https://github.com/vim/vim/commit/d823fa910cca43fec3c31c030ee908a14c272640
- if has('patch-7.4.2200')
- " clean up previous list
- if l:listtype == "quickfix"
- let l:list_title = getqflist({'title': 1})
- else
- let l:list_title = getloclist(0, {'title': 1})
- endif
- else
- " can't check the title, so assume that the list was for go fmt.
- let l:list_title = {'title': 'Format'}
- endif
-
- if has_key(l:list_title, "title") && l:list_title['title'] == "Format"
- call go#list#Clean(l:listtype)
- endif
+ call go#fmt#CleanErrors()
endfunction
" run runs the gofmt/goimport command for the given source file and returns
@@ -169,39 +175,42 @@ function! s:fmt_cmd(bin_name, source, target)
return cmd
endfunction
-" parse_errors parses the given errors and returns a list of parsed errors
-function! s:parse_errors(filename, content) abort
- let splitted = split(a:content, '\n')
+" replace_filename replaces the filename on each line of content with
+" a:filename.
+function! s:replace_filename(filename, content) abort
+ let l:errors = split(a:content, '\n')
- " list of errors to be put into location list
- let errors = []
- for line in splitted
- let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
- if !empty(tokens)
- call add(errors,{
- \"filename": a:filename,
- \"lnum": tokens[2],
- \"col": tokens[3],
- \"text": tokens[4],
- \ })
- endif
- endfor
-
- return errors
+ let l:errors = map(l:errors, printf('substitute(v:val, ''^.\{-}:'', ''%s:'', '''')', a:filename))
+ return join(l:errors, "\n")
endfunction
-" show_errors opens a location list and shows the given errors. If the given
-" errors is empty, it closes the the location list
-function! s:show_errors(errors) abort
+function! go#fmt#CleanErrors() abort
let l:listtype = go#list#Type("GoFmt")
- if !empty(a:errors)
- call go#list#Populate(l:listtype, a:errors, 'Format')
- echohl Error | echomsg "Gofmt returned error" | echohl None
+
+ " clean up previous list
+ if l:listtype == "quickfix"
+ let l:list_title = getqflist({'title': 1})
+ else
+ let l:list_title = getloclist(0, {'title': 1})
endif
+ if has_key(l:list_title, 'title') && (l:list_title['title'] == 'Format' || l:list_title['title'] == 'GoMetaLinterAutoSave')
+ call go#list#Clean(l:listtype)
+ endif
+endfunction
+
+" show_errors opens a location list and shows the given errors. If errors is
+" empty, it closes the the location list.
+function! go#fmt#ShowErrors(errors) abort
+ let l:errorformat = '%f:%l:%c:\ %m'
+ let l:listtype = go#list#Type("GoFmt")
+
+ call go#list#ParseFormat(l:listtype, l:errorformat, a:errors, 'Format', 0)
+ let l:errors = go#list#Get(l:listtype)
+
" this closes the window if there are no errors or it opens
- " it if there is any
- call go#list#Window(l:listtype, len(a:errors))
+ " it if there are any.
+ call go#list#Window(l:listtype, len(l:errors))
endfunction
function! go#fmt#ToggleFmtAutoSave() abort
diff --git a/pack/acp/start/vim-go/autoload/go/fmt_test.vim b/pack/acp/start/vim-go/autoload/go/fmt_test.vim
index b1b740a..d921cfc 100644
--- a/pack/acp/start/vim-go/autoload/go/fmt_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/fmt_test.vim
@@ -35,7 +35,7 @@ func! Test_update_file() abort
endfunc
func! Test_goimports() abort
- let $GOPATH = 'test-fixtures/fmt/'
+ let $GOPATH = printf('%s/%s', fnamemodify(getcwd(), ':p'), 'test-fixtures/fmt')
let actual_file = tempname()
call writefile(readfile("test-fixtures/fmt/src/imports/goimports.go"), actual_file)
diff --git a/pack/acp/start/vim-go/autoload/go/guru.vim b/pack/acp/start/vim-go/autoload/go/guru.vim
index 8ff3b3f..91d5a65 100644
--- a/pack/acp/start/vim-go/autoload/go/guru.vim
+++ b/pack/acp/start/vim-go/autoload/go/guru.vim
@@ -232,11 +232,10 @@ function! go#guru#Describe(selected) abort
endfunction
function! go#guru#DescribeInfo(showstatus) abort
- " json_encode() and friends are introduced with this patch (7.4.1304)
- " vim: https://groups.google.com/d/msg/vim_dev/vLupTNhQhZ8/cDGIk0JEDgAJ
- " nvim: https://github.com/neovim/neovim/pull/4131
+
+ " check if the version of Vim being tested supports json_decode()
if !exists("*json_decode")
- call go#util#EchoError("requires 'json_decode'. Update your Vim/Neovim version.")
+ call go#util#EchoError("GoDescribeInfo requires 'json_decode'. Update your Vim/Neovim version.")
return
endif
@@ -406,43 +405,31 @@ endfunction
" Show all refs to entity denoted by selected identifier
function! go#guru#Referrers(selected) abort
let args = {
- \ 'mode': 'referrers',
- \ 'format': 'plain',
- \ 'selected': a:selected,
- \ 'needs_scope': 0,
- \ }
+ \ 'mode': 'referrers',
+ \ 'format': 'plain',
+ \ 'selected': a:selected,
+ \ 'needs_scope': 0,
+ \ }
call s:run_guru(args)
endfunction
function! go#guru#SameIds(showstatus) abort
- " we use matchaddpos() which was introduce with 7.4.330, be sure we have
- " it: http://ftp.vim.org/vim/patches/7.4/7.4.330
+ " check if the version of Vim being tested supports matchaddpos()
if !exists("*matchaddpos")
call go#util#EchoError("GoSameIds requires 'matchaddpos'. Update your Vim/Neovim version.")
return
endif
- " json_encode() and friends are introduced with this patch (7.4.1304)
- " vim: https://groups.google.com/d/msg/vim_dev/vLupTNhQhZ8/cDGIk0JEDgAJ
- " nvim: https://github.com/neovim/neovim/pull/4131
+ " check if the version of Vim being tested supports json_decode()
if !exists("*json_decode")
call go#util#EchoError("GoSameIds requires 'json_decode'. Update your Vim/Neovim version.")
return
endif
- let args = {
- \ 'mode': 'what',
- \ 'format': 'json',
- \ 'selected': -1,
- \ 'needs_scope': 0,
- \ 'custom_parse': function('s:same_ids_highlight'),
- \ }
- if !a:showstatus
- let args.disable_progress = 1
- endif
-
- call s:run_guru(args)
+ let [l:line, l:col] = getpos('.')[1:2]
+ let [l:line, l:col] = go#lsp#lsp#Position(l:line, l:col)
+ call go#lsp#SameIDs(0, expand('%:p'), l:line, l:col, funcref('s:same_ids_highlight'))
endfunction
function! s:same_ids_highlight(exit_val, output, mode) abort
@@ -482,18 +469,26 @@ function! s:same_ids_highlight(exit_val, output, mode) abort
endif
let same_ids = result['sameids']
+
" highlight the lines
+ let l:matches = []
for item in same_ids
let pos = split(item, ':')
- call matchaddpos('goSameId', [[str2nr(pos[-2]), str2nr(pos[-1]), str2nr(poslen)]])
+ let l:matches = add(l:matches, [str2nr(pos[-2]), str2nr(pos[-1]), str2nr(poslen)])
endfor
+ call go#util#HighlightPositions('goSameId', l:matches)
+
if go#config#AutoSameids()
" re-apply SameIds at the current cursor position at the time the buffer
" is redisplayed: e.g. :edit, :GoRename, etc.
augroup vim-go-sameids
autocmd! *
- autocmd BufWinEnter nested call go#guru#SameIds(0)
+ if has('textprop')
+ autocmd BufReadPost nested call go#guru#SameIds(0)
+ else
+ autocmd BufWinEnter nested call go#guru#SameIds(0)
+ endif
augroup end
endif
endfunction
@@ -501,15 +496,7 @@ endfunction
" ClearSameIds returns 0 when it removes goSameId groups and non-zero if no
" goSameId groups are found.
function! go#guru#ClearSameIds() abort
- let l:cleared = 0
-
- let m = getmatches()
- for item in m
- if item['group'] == 'goSameId'
- call matchdelete(item['id'])
- let l:cleared = 1
- endif
- endfor
+ let l:cleared = go#util#ClearHighlights('goSameId')
if !l:cleared
return 1
@@ -534,11 +521,11 @@ function! go#guru#AutoToggleSameIds() abort
call go#util#EchoProgress("sameids auto highlighting disabled")
call go#guru#ClearSameIds()
call go#config#SetAutoSameids(0)
- return
+ else
+ call go#util#EchoSuccess("sameids auto highlighting enabled")
+ call go#config#SetAutoSameids(1)
endif
-
- call go#util#EchoSuccess("sameids auto highlighting enabled")
- call go#config#SetAutoSameids(1)
+ call go#auto#update_autocmd()
endfunction
@@ -565,11 +552,11 @@ function! s:parse_guru_output(exit_val, output, title) abort
let errformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m"
let l:listtype = go#list#Type("_guru")
- call go#list#ParseFormat(l:listtype, errformat, a:output, a:title)
+ call go#list#ParseFormat(l:listtype, errformat, a:output, a:title, 0)
let errors = go#list#Get(l:listtype)
call go#list#Window(l:listtype, len(errors))
-endfun
+endfunction
function! go#guru#Scope(...) abort
if a:0
@@ -602,11 +589,9 @@ function! go#guru#DescribeBalloon() abort
return
endif
- " json_encode() and friends are introduced with this patch (7.4.1304)
- " vim: https://groups.google.com/d/msg/vim_dev/vLupTNhQhZ8/cDGIk0JEDgAJ
- " nvim: https://github.com/neovim/neovim/pull/4131
+ " check if the version of Vim being tested supports json_decode()
if !exists("*json_decode")
- call go#util#EchoError("requires 'json_decode'. Update your Vim/Neovim version.")
+ call go#util#EchoError("GoDescribeBalloon requires 'json_decode'. Update your Vim/Neovim version.")
return
endif
diff --git a/pack/acp/start/vim-go/autoload/go/highlight_test.vim b/pack/acp/start/vim-go/autoload/go/highlight_test.vim
index 5693871..9360a8f 100644
--- a/pack/acp/start/vim-go/autoload/go/highlight_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/highlight_test.vim
@@ -98,6 +98,325 @@ function! Test_gomodVersion_incompatible_highlight() abort
endtry
endfunc
+function! Test_numeric_literal_highlight() abort
+ syntax on
+
+ let tests = {
+ \ 'lone zero': {'group': 'goDecimalInt', 'value': '0'},
+ \ 'integer': {'group': 'goDecimalInt', 'value': '1234567890'},
+ \ 'integerGrouped': {'group': 'goDecimalInt', 'value': '1_234_567_890'},
+ \ 'integerErrorLeadingUnderscore': {'group': 'goDecimalError', 'value': '_1234_567_890'},
+ \ 'integerErrorTrailingUnderscore': {'group': 'goDecimalError', 'value': '1_234_567890_'},
+ \ 'integerErrorDoubleUnderscore': {'group': 'goDecimalError', 'value': '1_234__567_890'},
+ \ 'hexadecimal': {'group': 'goHexadecimalInt', 'value': '0x0123456789abdef'},
+ \ 'hexadecimalGrouped': {'group': 'goHexadecimalInt', 'value': '0x012_345_678_9ab_def'},
+ \ 'hexadecimalErrorLeading': {'group': 'goHexadecimalError', 'value': '0xg0123456789abdef'},
+ \ 'hexadecimalErrorTrailing': {'group': 'goHexadecimalError', 'value': '0x0123456789abdefg'},
+ \ 'hexadecimalErrorDoubleUnderscore': {'group': 'goHexadecimalError', 'value': '0x__0123456789abdef'},
+ \ 'hexadecimalErrorTrailingUnderscore': {'group': 'goHexadecimalError', 'value': '0x0123456789abdef_'},
+ \ 'heXadecimal': {'group': 'goHexadecimalInt', 'value': '0X0123456789abdef'},
+ \ 'heXadecimalErrorLeading': {'group': 'goHexadecimalError', 'value': '0Xg0123456789abdef'},
+ \ 'heXadecimalErrorTrailing': {'group': 'goHexadecimalError', 'value': '0X0123456789abdefg'},
+ \ 'octal': {'group': 'goOctalInt', 'value': '01234567'},
+ \ 'octalPrefix': {'group': 'goOctalInt', 'value': '0o1234567'},
+ \ 'octalGrouped': {'group': 'goOctalInt', 'value': '0o1_234_567'},
+ \ 'octalErrorLeading': {'group': 'goOctalError', 'value': '081234567'},
+ \ 'octalErrorTrailing': {'group': 'goOctalError', 'value': '012345678'},
+ \ 'octalErrorDoubleUnderscore': {'group': 'goOctalError', 'value': '0o__1234567'},
+ \ 'octalErrorTrailingUnderscore': {'group': 'goOctalError', 'value': '0o_123456_7_'},
+ \ 'octalErrorTrailingO': {'group': 'goOctalError', 'value': '0o_123456_7o'},
+ \ 'octalErrorTrailingX': {'group': 'goOctalError', 'value': '0o_123456_7x'},
+ \ 'octalErrorTrailingB': {'group': 'goOctalError', 'value': '0o_123456_7b'},
+ \ 'OctalPrefix': {'group': 'goOctalInt', 'value': '0O1234567'},
+ \ 'binaryInt': {'group': 'goBinaryInt', 'value': '0b0101'},
+ \ 'binaryIntGrouped': {'group': 'goBinaryInt', 'value': '0b_01_01'},
+ \ 'binaryErrorLeading': {'group': 'goBinaryError', 'value': '0b20101'},
+ \ 'binaryErrorTrailing': {'group': 'goBinaryError', 'value': '0b01012'},
+ \ 'binaryErrorDoubleUnderscore': {'group': 'goBinaryError', 'value': '0b_01__01'},
+ \ 'binaryOverrideOctal': {'group': 'goBinaryError', 'value': '0b1234567'},
+ \ 'binaryErrorTrailingUnderscore': {'group': 'goBinaryError', 'value': '0b_01_01_'},
+ \ 'BinaryInt': {'group': 'goBinaryInt', 'value': '0B0101'},
+ \ 'BinaryErrorLeading': {'group': 'goBinaryError', 'value': '0B20101'},
+ \ 'BinaryErrorTrailing': {'group': 'goBinaryError', 'value': '0B01012'},
+ \ }
+
+ for kv in items(tests)
+ let l:actual = s:numericHighlightGroupInAssignment(kv[0], kv[1].value)
+ call assert_equal(kv[1].group, l:actual, kv[0])
+ endfor
+endfunction
+
+function! Test_zero_as_index_element() abort
+ syntax on
+
+ let l:actual = s:numericHighlightGroupInSliceElement('zero-element', '0')
+ call assert_equal('goDecimalInt', l:actual)
+ let l:actual = s:numericHighlightGroupInMultidimensionalSliceElement('zero-element', '0')
+ call assert_equal('goDecimalInt', l:actual, 'multi-dimensional')
+endfunction
+
+function! Test_zero_as_slice_index() abort
+ syntax on
+
+ let l:actual = s:numericHighlightGroupInSliceIndex('zero-index', '0')
+ call assert_equal('goDecimalInt', l:actual)
+ let l:actual = s:numericHighlightGroupInMultidimensionalSliceIndex('zero-index', '0', '0')
+
+ call assert_equal('goDecimalInt', l:actual, 'multi-dimensional')
+endfunction
+
+function! Test_zero_as_start_slicing_slice() abort
+ syntax on
+
+ let l:actual = s:numericHighlightGroupInSliceSlicing('slice-slicing', '0', '1')
+ call assert_equal('goDecimalInt', l:actual)
+endfunction
+
+function! s:numericHighlightGroupInAssignment(testname, value)
+ let l:dir = gotest#write_file(printf('numeric/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ printf("var v = %s\x1f", a:value),
+ \ ])
+
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:numericHighlightGroupInSliceElement(testname, value)
+ let l:dir = gotest#write_file(printf('numeric/slice-element/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ printf("v := []int{\x1f%s}", a:value),
+ \ ])
+
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:numericHighlightGroupInMultidimensionalSliceElement(testname, value)
+ let l:dir = gotest#write_file(printf('numeric/slice-multidimensional-element/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ printf("v := [][]int{{\x1f%s},{%s}}", a:value, a:value),
+ \ ])
+
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:numericHighlightGroupInSliceIndex(testname, value)
+ let l:dir = gotest#write_file(printf('numeric/slice-index/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ 'var sl []int',
+ \ printf("println(sl[\x1f%s])", a:value),
+ \ ])
+
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:numericHighlightGroupInMultidimensionalSliceIndex(testname, first, second)
+ let l:dir = gotest#write_file(printf('numeric/slice-multidimensional-index/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ 'var sl [][]int',
+ \ printf("println(sl[\x1f%s][%s])", a:first, a:second),
+ \ ])
+
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:numericHighlightGroupInSliceSlicing(testname, from, to)
+ let l:dir = gotest#write_file(printf('numeric/slice-slicing/%s.go', a:testname), [
+ \ 'package numeric',
+ \ '',
+ \ 'var sl = []int{1,2}',
+ \ printf("println(sl[\x1f%s:%s])", a:from, a:to),
+ \ ])
+ try
+ let l:pos = getcurpos()
+ let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+ return l:actual
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! Test_diagnostic_after_fmt() abort
+ let g:go_fmt_command = 'gofmt'
+ try
+ call s:diagnostic_after_write( [
+ \ 'package main',
+ \ 'import "fmt"',
+ \ '',
+ \ 'func main() {',
+ \ '',
+ \ "\tfmt.Println(\x1fhello)",
+ \ '}',
+ \ ], [])
+ finally
+ unlet g:go_fmt_command
+ endtry
+endfunction
+
+function! Test_diagnostic_after_fmt_change() abort
+ " craft a file that will be changed when its written (gofmt will change it).
+ let g:go_fmt_command = 'gofmt'
+ try
+ call s:diagnostic_after_write( [
+ \ 'package main',
+ \ 'import "fmt"',
+ \ '',
+ \ 'func main() {',
+ \ '',
+ \ "fmt.Println(\x1fhello)",
+ \ '}',
+ \ ], [])
+ finally
+ unlet g:go_fmt_command
+ endtry
+endfunction
+
+function! Test_diagnostic_after_fmt_cleared() abort
+ " craft a file that will be fixed when it is written.
+ let g:go_fmt_command = 'gofmt'
+ try
+ call s:diagnostic_after_write( [
+ \ 'package main',
+ \ 'import "fmt"',
+ \ '',
+ \ 'func main() {',
+ \ '',
+ \ "fmt.Println(\x1fhello)",
+ \ '}',
+ \ ], ['hello := "hello, vim-go"'])
+ finally
+ unlet g:go_fmt_command
+ endtry
+endfunction
+
+function! Test_diagnostic_after_reload() abort
+ let l:dir = gotest#write_file('diagnostic/after-reload.go', [
+ \ 'package main',
+ \ 'import "fmt"',
+ \ '',
+ \ 'func main() {',
+ \ '',
+ \ "\tfmt.Println(\x1fhello)",
+ \ '}',
+ \ ])
+ try
+ call s:check_diagnostics('', 'goDiagnosticError', 'initial')
+ let l:pos = getcurpos()
+ edit
+ call setpos('.', l:pos)
+ call s:check_diagnostics('', 'goDiagnosticError', 'after-reload')
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:diagnostic_after_write(contents, changes) abort
+ syntax on
+
+ let l:dir = gotest#write_file('diagnostic/after-write.go', a:contents)
+
+ try
+ let l:pos = getcurpos()
+ call s:check_diagnostics('', 'goDiagnosticError', 'initial')
+
+ " write a:changes to the previous line and make sure l:actual and
+ " l:expected are set so that they won't accidentally match on the next
+ " check.
+ if len(a:changes) > 0
+ call append(l:pos[1]-1, a:changes)
+ let l:actual = 'goDiagnosticError'
+ let l:expected = ''
+ else
+ let l:actual = ''
+ let l:expected = 'goDiagnosticError'
+ endif
+
+ write
+
+ call s:check_diagnostics(l:actual, l:expected, 'after-write')
+ finally
+ call delete(l:dir, 'rf')
+ endtry
+endfunction
+
+function! s:check_diagnostics(actual, expected, when)
+ let l:actual = a:actual
+ let l:start = reltime()
+
+ while l:actual != a:expected && reltimefloat(reltime(l:start)) < 10
+ " Get the cursor position on each iteration, because the cursor postion
+ " may change between iterations when go#fmt#GoFmt formats, reloads the
+ " file, and moves the cursor to try to keep it where the user expects it
+ " to be when gofmt modifies the files.
+ let l:pos = getcurpos()
+ if !has('textprop')
+ let l:matches = getmatches()
+ if len(l:matches) == 0
+ let l:actual = ''
+ endif
+
+ for l:m in l:matches
+ let l:matchline = l:m.pos1[0]
+ if len(l:m.pos1) < 2
+ continue
+ endif
+ let l:matchcol = get(l:m.pos1, 1, 1)
+ if l:pos[1] == l:matchline && l:pos[2] >= l:matchcol && l:pos[2] <= l:matchcol + l:m.pos1[2]
+ " Ideally, we'd check that the cursor is within the match, but when a
+ " tab is added on the current line, the cursor position within the
+ " line will stay constant while the line itself is shifted over by a
+ " column, so just check the line itself instead of checking a precise
+ " cursor location.
+ " if l:pos[1] == l:matchline
+ let l:actual = l:m.group
+ break
+ endif
+ endfor
+
+ sleep 100m
+ continue
+ endif
+
+ let l:actual = get(prop_list(l:pos[1]), 0, {'type': ''}).type
+ sleep 100m
+ endwhile
+
+ call assert_equal(a:expected, l:actual, a:when)
+endfunction
" restore Vi compatibility settings
let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/pack/acp/start/vim-go/autoload/go/impl_test.vim b/pack/acp/start/vim-go/autoload/go/impl_test.vim
index 0809836..6be39a1 100644
--- a/pack/acp/start/vim-go/autoload/go/impl_test.vim
+++ b/pack/acp/start/vim-go/autoload/go/impl_test.vim
@@ -12,7 +12,7 @@ func! Test_impl() abort
call go#impl#Impl('r', 'reader', 'io.Reader')
call gotest#assert_buffer(1, [
\ 'func (r reader) Read(p []byte) (n int, err error) {',
- \ ' panic("not implemented")',
+ \ ' panic("not implemented") // TODO: Implement',
\ '}'])
finally
call delete(l:tmp, 'rf')
@@ -33,7 +33,7 @@ func! Test_impl_get() abort
\ 'type reader struct {}',
\ '',
\ 'func (r *reader) Read(p []byte) (n int, err error) {',
- \ ' panic("not implemented")',
+ \ ' panic("not implemented") // TODO: Implement',
\ '}'])
finally
call delete(l:tmp, 'rf')
diff --git a/pack/acp/start/vim-go/autoload/go/implements.vim b/pack/acp/start/vim-go/autoload/go/implements.vim
new file mode 100644
index 0000000..0d25f8c
--- /dev/null
+++ b/pack/acp/start/vim-go/autoload/go/implements.vim
@@ -0,0 +1,44 @@
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! go#implements#Implements(selected) abort
+ let l:mode = go#config#ImplementsMode()
+ if l:mode == 'guru'
+ call go#guru#Implements(a:selected)
+ return
+ elseif l:mode == 'gopls'
+ if !go#config#GoplsEnabled()
+ call go#util#EchoError("go_implements_mode is 'gopls', but gopls is disabled")
+ endif
+ let [l:line, l:col] = getpos('.')[1:2]
+ let [l:line, l:col] = go#lsp#lsp#Position(l:line, l:col)
+ let l:fname = expand('%:p')
+ call go#lsp#Implements(l:fname, l:line, l:col, funcref('s:parse_output'))
+ return
+ else
+ call go#util#EchoWarning('unknown value for g:go_implements_mode')
+ endif
+endfunction
+
+" This uses Vim's errorformat to parse the output and put it into a quickfix
+" or locationlist.
+function! s:parse_output(exit_val, output, title) abort
+ if a:exit_val
+ call go#util#EchoError(a:output)
+ return
+ endif
+
+ let errformat = ",%f:%l:%c:\ %m"
+ let l:listtype = go#list#Type("GoImplements")
+ call go#list#ParseFormat(l:listtype, errformat, a:output, a:title, 0)
+
+ let errors = go#list#Get(l:listtype)
+ call go#list#Window(l:listtype, len(errors))
+endfunction
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2 ts=2 et
diff --git a/pack/acp/start/vim-go/autoload/go/import.vim b/pack/acp/start/vim-go/autoload/go/import.vim
index 4e84896..848a5c0 100644
--- a/pack/acp/start/vim-go/autoload/go/import.vim
+++ b/pack/acp/start/vim-go/autoload/go/import.vim
@@ -82,7 +82,7 @@ function! go#import#SwitchImport(enabled, localname, path, bang) abort
while line <= line("$")
let line = line + 1
let linestr = getline(line)
- let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)')
+ let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\w\+\s\+\)\="\(.\+\)"\)')
if empty(m)
if siteprefix == "" && a:enabled
" must be in the first group
diff --git a/pack/acp/start/vim-go/autoload/go/import_test.vim b/pack/acp/start/vim-go/autoload/go/import_test.vim
new file mode 100644
index 0000000..c4306a1
--- /dev/null
+++ b/pack/acp/start/vim-go/autoload/go/import_test.vim
@@ -0,0 +1,35 @@
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+func! Test_SwitchImportAddIgnoresCommented()
+ try
+ let l:tmp = gotest#write_file('import/import.go', [
+ \ 'package import',
+ \ '',
+ \ 'import (',
+ \ "\t" . '// "fmt"',
+ \ "\t" . '"io"',
+ \ "\t" . '"ioutil"',
+ \ "\t" . '"os"',
+ \ ')',
+ \ '',
+ \ 'func main() {',
+ \ ' io.Copy(ioutil.Discard, os.Stdin)',
+ \ ' fmt.Println("import the package")',
+ \ '}',
+ \ ])
+ call go#import#SwitchImport(1, '', 'fmt', 0)
+
+ let l:actual = getline(4)
+ call assert_equal("\t" . '"fmt"', l:actual)
+ finally
+ call delete(l:tmp, 'rf')
+ endtry
+endfunc
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2 ts=2 et
diff --git a/pack/acp/start/vim-go/autoload/go/issue.vim b/pack/acp/start/vim-go/autoload/go/issue.vim
index 65db9d8..135cc25 100644
--- a/pack/acp/start/vim-go/autoload/go/issue.vim
+++ b/pack/acp/start/vim-go/autoload/go/issue.vim
@@ -18,20 +18,34 @@ function! s:issuebody() abort
for l in lines
let body = add(body, l)
- if l =~ '^\* Vim version'
- redir => out
- silent version
- redir END
+ if l =~ '^'
let [out, err] = go#util#Exec(['go', 'version'])
let body = add(body, substitute(l:out, rtrimpat, '', ''))
- elseif l =~ '^\* Go environment'
- let [out, err] = go#util#Exec(['go', 'env'])
+ elseif l =~ '^'
+ let [out, err] = go#util#ExecInDir(['go', 'env'])
+ let body = add(body, substitute(l:out, rtrimpat, '', ''))
+ elseif l=~ '^'
+ let [out, err] = go#util#Exec(['gopls', 'version'])
let body = add(body, substitute(l:out, rtrimpat, '', ''))
endif
endfor
+ let body = add(body, "\n#### vim-go configuration:\nvim-go configuration
")
+
+ for k in keys(g:)
+ if k =~ '^go_'
+ let body = add(body, 'g:' . k . ' = ' . string(get(g:, k)))
+ endif
+ endfor
+
+ let body = add(body, '
filetype detection
%s", execute('filetype')))
+ let body = add(body, '