From f7cf5ded9d76472c71cdbd17935aca38366944be Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 10 Mar 2020 14:37:15 +0900 Subject: Add golangci-lint-langserver --- installer/install-golangci-lint-langserver.cmd | 3 +++ installer/install-golangci-lint-langserver.sh | 5 +++++ settings.json | 9 +++++++++ settings/golangci-lint-langserver.vim | 14 ++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 installer/install-golangci-lint-langserver.cmd create mode 100644 installer/install-golangci-lint-langserver.sh create mode 100644 settings/golangci-lint-langserver.vim diff --git a/installer/install-golangci-lint-langserver.cmd b/installer/install-golangci-lint-langserver.cmd new file mode 100644 index 0000000..256b235 --- /dev/null +++ b/installer/install-golangci-lint-langserver.cmd @@ -0,0 +1,3 @@ +@echo off + +call "%~dp0\go_install.cmd" github.com/nametake/golangci-lint-langserver@latest diff --git a/installer/install-golangci-lint-langserver.sh b/installer/install-golangci-lint-langserver.sh new file mode 100644 index 0000000..3059554 --- /dev/null +++ b/installer/install-golangci-lint-langserver.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +"$(dirname "$0")/go_install.sh" github.com/nametake/golangci-lint-langserver@latest diff --git a/settings.json b/settings.json index c3162ae..3e7eaa5 100644 --- a/settings.json +++ b/settings.json @@ -207,6 +207,15 @@ "root_uri_patterns": [ "go.mod" ] + }, + { + "command": "golangci-lint-langserver", + "requires": [ + "go" + ], + "root_uri_patterns": [ + "go.mod" + ] } ], "graphql": [ diff --git a/settings/golangci-lint-langserver.vim b/settings/golangci-lint-langserver.vim new file mode 100644 index 0000000..b2f3000 --- /dev/null +++ b/settings/golangci-lint-langserver.vim @@ -0,0 +1,14 @@ +augroup vim_lsp_settings_golangci_lint_langserver + au! + LspRegisterServer { + \ 'name': 'golangci-lint-langserver', + \ 'cmd': {server_info->lsp_settings#get('golangci-lint-langserver', 'cmd', [lsp_settings#exec_path('golangci-lint-langserver')])}, + \ 'root_uri':{server_info->lsp_settings#get('golangci-lint-langserver', 'root_uri', lsp_settings#root_uri('golangci-lint-langserver'))}, + \ 'initialization_options': lsp_settings#get('golangci-lint-langserver', 'initialization_options', {}), + \ 'whitelist': lsp_settings#get('golangci-lint-langserver', 'whitelist', ['go']), + \ 'blacklist': lsp_settings#get('golangci-lint-langserver', 'blacklist', []), + \ 'config': lsp_settings#get('golangci-lint-langserver', 'config', lsp_settings#server_config('golangci-lint-langserver')), + \ 'workspace_config': lsp_settings#get('golangci-lint-langserver', 'workspace_config', {}), + \ 'semantic_highlight': lsp_settings#get('golangci-lint-langserver', 'semantic_highlight', {}), + \ } +augroup END -- cgit v1.2.3-54-g00ecf From 216943ea305f28a6a4eaab3d5044994da9c03e80 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 10 Mar 2020 14:39:39 +0900 Subject: Fix arguments --- settings/golangci-lint-langserver.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/golangci-lint-langserver.vim b/settings/golangci-lint-langserver.vim index b2f3000..b093359 100644 --- a/settings/golangci-lint-langserver.vim +++ b/settings/golangci-lint-langserver.vim @@ -2,7 +2,7 @@ augroup vim_lsp_settings_golangci_lint_langserver au! LspRegisterServer { \ 'name': 'golangci-lint-langserver', - \ 'cmd': {server_info->lsp_settings#get('golangci-lint-langserver', 'cmd', [lsp_settings#exec_path('golangci-lint-langserver')])}, + \ 'cmd': {server_info->lsp_settings#get('golangci-lint-langserver', 'cmd', [lsp_settings#exec_path('golangci-lint-langserver'), 'run', '--enable-all', '--disable', 'lll', '--out-format', 'json'])}, \ 'root_uri':{server_info->lsp_settings#get('golangci-lint-langserver', 'root_uri', lsp_settings#root_uri('golangci-lint-langserver'))}, \ 'initialization_options': lsp_settings#get('golangci-lint-langserver', 'initialization_options', {}), \ 'whitelist': lsp_settings#get('golangci-lint-langserver', 'whitelist', ['go']), -- cgit v1.2.3-54-g00ecf From a0dbda5c00ec045360f4d46980de625ef1a5738a Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 10 Mar 2020 14:41:41 +0900 Subject: Set GO111MODULE=on --- installer/go_install.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/installer/go_install.cmd b/installer/go_install.cmd index 642b6a9..1455953 100644 --- a/installer/go_install.cmd +++ b/installer/go_install.cmd @@ -2,6 +2,7 @@ if "x%1" equ "x" goto :EOF +set GO111MODULE=on set GOPATH=%cd% set GOBIN=%cd% go get -v -u %1 -- cgit v1.2.3-54-g00ecf From 2d285907648d393e1326fa8d53fd4796b06f6970 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 10 Mar 2020 14:45:31 +0900 Subject: Fix arguments --- settings/golangci-lint-langserver.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/golangci-lint-langserver.vim b/settings/golangci-lint-langserver.vim index b093359..ef2903c 100644 --- a/settings/golangci-lint-langserver.vim +++ b/settings/golangci-lint-langserver.vim @@ -2,9 +2,9 @@ augroup vim_lsp_settings_golangci_lint_langserver au! LspRegisterServer { \ 'name': 'golangci-lint-langserver', - \ 'cmd': {server_info->lsp_settings#get('golangci-lint-langserver', 'cmd', [lsp_settings#exec_path('golangci-lint-langserver'), 'run', '--enable-all', '--disable', 'lll', '--out-format', 'json'])}, + \ 'cmd': {server_info->lsp_settings#get('golangci-lint-langserver', 'cmd', [lsp_settings#exec_path('golangci-lint-langserver')])}, \ 'root_uri':{server_info->lsp_settings#get('golangci-lint-langserver', 'root_uri', lsp_settings#root_uri('golangci-lint-langserver'))}, - \ 'initialization_options': lsp_settings#get('golangci-lint-langserver', 'initialization_options', {}), + \ 'initialization_options': lsp_settings#get('golangci-lint-langserver', 'initialization_options', {'command': ['golangci-lint', 'run', '--enable-all', '--disable', 'lll', '--out-format', 'json']}), \ 'whitelist': lsp_settings#get('golangci-lint-langserver', 'whitelist', ['go']), \ 'blacklist': lsp_settings#get('golangci-lint-langserver', 'blacklist', []), \ 'config': lsp_settings#get('golangci-lint-langserver', 'config', lsp_settings#server_config('golangci-lint-langserver')), -- cgit v1.2.3-54-g00ecf From d57fa14fec4bcd9824c2f4930c622ac2e2bdade5 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 10 Mar 2020 14:49:28 +0900 Subject: Install golangci-lint --- installer/go_install.cmd | 4 +++- installer/install-golangci-lint-langserver.cmd | 1 + installer/install-golangci-lint-langserver.sh | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installer/go_install.cmd b/installer/go_install.cmd index 1455953..fa4c0f0 100644 --- a/installer/go_install.cmd +++ b/installer/go_install.cmd @@ -2,10 +2,12 @@ if "x%1" equ "x" goto :EOF +setlocal + set GO111MODULE=on set GOPATH=%cd% set GOBIN=%cd% go get -v -u %1 set GOBIN= go clean -modcache -rd /S /Q "src" "pkg" 2> NULL +rd /S /Q "src" "pkg" 2> NUL diff --git a/installer/install-golangci-lint-langserver.cmd b/installer/install-golangci-lint-langserver.cmd index 256b235..b64ef38 100644 --- a/installer/install-golangci-lint-langserver.cmd +++ b/installer/install-golangci-lint-langserver.cmd @@ -1,3 +1,4 @@ @echo off call "%~dp0\go_install.cmd" github.com/nametake/golangci-lint-langserver@latest +call "%~dp0\go_install.cmd" github.com/golangci/golangci-lint@latest diff --git a/installer/install-golangci-lint-langserver.sh b/installer/install-golangci-lint-langserver.sh index 3059554..92c8c3a 100644 --- a/installer/install-golangci-lint-langserver.sh +++ b/installer/install-golangci-lint-langserver.sh @@ -3,3 +3,4 @@ set -e "$(dirname "$0")/go_install.sh" github.com/nametake/golangci-lint-langserver@latest +"$(dirname "$0")/go_install.sh" github.com/golangci/golangci-lint@latest -- cgit v1.2.3-54-g00ecf