From 412778027ba2b14d1179bb5a4813e9c04c650ed3 Mon Sep 17 00:00:00 2001 From: skanehira Date: Sun, 29 Dec 2019 16:27:41 +0900 Subject: [PATCH 1/2] fix #2637 --- plugin/go.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/go.vim b/plugin/go.vim index 129f6f8bee..24b6460010 100644 --- a/plugin/go.vim +++ b/plugin/go.vim @@ -301,7 +301,7 @@ augroup vim-go autocmd BufRead *.s call s:gofiletype_pre() autocmd BufReadPost *.s call s:gofiletype_post() - if go#util#has_job() + if go#util#has_job() && go#config#GoplsEnabled() autocmd FileType * call s:register() endif augroup end From a179cf927d27399fd7b9252dd5188ffea3b0bf11 Mon Sep 17 00:00:00 2001 From: skanehira Date: Sun, 29 Dec 2019 17:34:53 +0900 Subject: [PATCH 2/2] add default value at newlsp for #2637 --- autoload/go/lsp.vim | 6 +++++- plugin/go.vim | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/autoload/go/lsp.vim b/autoload/go/lsp.vim index d40891b66c..04c68e70e8 100644 --- a/autoload/go/lsp.vim +++ b/autoload/go/lsp.vim @@ -21,7 +21,11 @@ function! s:lspfactory.reset() dict abort endfunction function! s:newlsp() abort - let l:lsp = {'sendMessage': funcref('s:noop')} + let l:lsp = { + \ 'sendMessage': funcref('s:noop'), + \ 'notificationQueue': {}, + \ 'fileVersions': {} + \ } if !go#config#GoplsEnabled() return l:lsp diff --git a/plugin/go.vim b/plugin/go.vim index 24b6460010..129f6f8bee 100644 --- a/plugin/go.vim +++ b/plugin/go.vim @@ -301,7 +301,7 @@ augroup vim-go autocmd BufRead *.s call s:gofiletype_pre() autocmd BufReadPost *.s call s:gofiletype_post() - if go#util#has_job() && go#config#GoplsEnabled() + if go#util#has_job() autocmd FileType * call s:register() endif augroup end