diff options
| -rw-r--r-- | autoload/lsp_settings.vim | 3 | ||||
| -rw-r--r-- | installer/go_install.cmd | 2 | ||||
| -rwxr-xr-x | installer/go_install.sh | 2 | ||||
| -rw-r--r-- | installer/install-efm-langserver.cmd | 2 | ||||
| -rwxr-xr-x | installer/install-efm-langserver.sh | 2 | ||||
| -rw-r--r-- | installer/install-gopls.cmd | 2 |
6 files changed, 8 insertions, 5 deletions
diff --git a/autoload/lsp_settings.vim b/autoload/lsp_settings.vim index 8d0db8c..bbb0fc9 100644 --- a/autoload/lsp_settings.vim +++ b/autoload/lsp_settings.vim @@ -52,6 +52,9 @@ function! s:vim_lsp_installer(ft, ...) abort if empty(l:server) return [] endif + if l:ft !=# '_' + let l:server += s:settings['_'] + endif let l:found = {} for l:conf in l:server let l:missing = 0 diff --git a/installer/go_install.cmd b/installer/go_install.cmd index fbd63c2..16e1ca8 100644 --- a/installer/go_install.cmd +++ b/installer/go_install.cmd @@ -5,4 +5,4 @@ if "x%1" equ "x" goto :EOF set GOPATH=%cd%
set GOBIN=%cd%
go get -v -u %1
-rd /S /Q "src"
+rd /S /Q "src" "pkg" 2> NULL
diff --git a/installer/go_install.sh b/installer/go_install.sh index b399969..be5feff 100755 --- a/installer/go_install.sh +++ b/installer/go_install.sh @@ -6,4 +6,4 @@ set -e GOPATH=$(pwd) GOBIN=$(pwd) GO111MODULE=on go get -v "$1" -rm -rf src +rm -rf src pkg 2> /dev/null diff --git a/installer/install-efm-langserver.cmd b/installer/install-efm-langserver.cmd index fc692b9..1d286cd 100644 --- a/installer/install-efm-langserver.cmd +++ b/installer/install-efm-langserver.cmd @@ -1,3 +1,3 @@ @echo off
-call "%~dp0\go_install.cmd" github.com/mattn/efm-langserver
+call "%~dp0\go_install.cmd" github.com/mattn/efm-langserver@latest
diff --git a/installer/install-efm-langserver.sh b/installer/install-efm-langserver.sh index efad942..2d87599 100755 --- a/installer/install-efm-langserver.sh +++ b/installer/install-efm-langserver.sh @@ -2,4 +2,4 @@ set -e -"$(dirname "$0")/go_install.sh" github.com/mattn/efm-langserver +"$(dirname "$0")/go_install.sh" github.com/mattn/efm-langserver@latest diff --git a/installer/install-gopls.cmd b/installer/install-gopls.cmd index 444e1ae..7371402 100644 --- a/installer/install-gopls.cmd +++ b/installer/install-gopls.cmd @@ -1,3 +1,3 @@ @echo off
-call "%~dp0\go_install.cmd" golang.org/x/tools/gopls
+call "%~dp0\go_install.cmd" golang.org/x/tools/gopls@latest
|