From 9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a Mon Sep 17 00:00:00 2001
From: LCD 47 <lcd047@gmail.com>
Date: Fri, 15 Jun 2018 10:50:36 +0300
Subject: [PATCH] Checker golangci_lint: cleanup.

---
 doc/syntastic-checkers.txt           | 43 ++++++++++++++++------------
 plugin/syntastic.vim                 |  2 +-
 syntax_checkers/go/golangci_lint.vim |  5 +---
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/doc/syntastic-checkers.txt b/doc/syntastic-checkers.txt
index 351ae964..917efe75 100644
--- a/doc/syntastic-checkers.txt
+++ b/doc/syntastic-checkers.txt
@@ -2512,11 +2512,11 @@ The following checkers are available for Go (filetype "go"):
 
     1. go.......................|syntastic-go-go|
     2. gofmt....................|syntastic-go-gofmt|
-    3. Golint...................|syntastic-go-golint|
-    4. Go Meta Linter...........|syntastic-go-gometalinter|
-    5. gotype...................|syntastic-go-gotype|
-    6. vet......................|syntastic-go-govet|
-    7. golangci-lint............|syntastic-go-golangci-lint|
+    3. GolangCI-Lint............|syntastic-go-golangci_lint|
+    4. Golint...................|syntastic-go-golint|
+    5. Go Meta Linter...........|syntastic-go-gometalinter|
+    6. gotype...................|syntastic-go-gotype|
+    7. vet......................|syntastic-go-govet|
 
 ------------------------------------------------------------------------------
 1. go                                                        *syntastic-go-go*
@@ -2565,7 +2565,22 @@ autocommand towards that end: >
     autocmd FileType go autocmd BufWritePre <buffer> Fmt
 <
 ------------------------------------------------------------------------------
-3. Golint                                                *syntastic-go-golint*
+3. GolangCI-Lint                                  *syntastic-go-golangci_lint*
+
+Name:        golangci_lint
+Maintainer:  Elvis Macak <elvis@lnmpy.com>
+
+GolangCI-Lint is a linters aggregator. See the project's page for details:
+
+    https://github.com/golangci/golangci-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. Golint                                                *syntastic-go-golint*
 
 Name:        golint
 Maintainer: Hiroshi Ioka <hirochachacha@gmail.com>
@@ -2580,7 +2595,7 @@ This checker is initialised using the "makeprgBuild()" function and thus it
 accepts the standard options described at |syntastic-config-makeprg|.
 
 ------------------------------------------------------------------------------
-4. Go Meta Linter                                  *syntastic-go-gometalinter*
+5. Go Meta Linter                                  *syntastic-go-gometalinter*
 
 Name:        gometalinter
 Maintainer: Joshua Rubin <joshua@rubixconsulting.com>
@@ -2597,7 +2612,7 @@ This checker is initialised using the "makeprgBuild()" function and thus it
 accepts the standard options described at |syntastic-config-makeprg|.
 
 ------------------------------------------------------------------------------
-5. gotype                                                *syntastic-go-gotype*
+6. gotype                                                *syntastic-go-gotype*
 
 Name:        gotype
 Maintainer:  luz <ne.tetewi@gmail.com>
@@ -2607,7 +2622,7 @@ See the tool's documentation for details:
     https://godoc.org/golang.org/x/tools/cmd/gotype
 
 ------------------------------------------------------------------------------
-6. vet                                                    *syntastic-go-govet*
+7. vet                                                    *syntastic-go-govet*
 
 Name:        govet
 Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
@@ -2621,16 +2636,6 @@ Note~
 This checker doesn't call the "makeprgBuild()" function, and thus it ignores
 the usual 'g:syntastic_go_govet_<option>' variables.
 
-------------------------------------------------------------------------------
-7. golangci-lint                                  *syntastic-go-golangci-lint*
-
-Name:        golangci-lint
-Maintainer:  Elvis Macak <elvis@lnmpy.com>
-
-See the tool's documentation for details:
-
-    https://github.com/golangci/golangci-lint
-
 ==============================================================================
 SYNTAX CHECKERS FOR HAML                             *syntastic-checkers-haml*
 
diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
index 67854bc3..32749d64 100644
--- a/plugin/syntastic.vim
+++ b/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.9.0-6'
+let g:_SYNTASTIC_VERSION = '3.9.0-9'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
diff --git a/syntax_checkers/go/golangci_lint.vim b/syntax_checkers/go/golangci_lint.vim
index 2b74af21..2c885fa5 100644
--- a/syntax_checkers/go/golangci_lint.vim
+++ b/syntax_checkers/go/golangci_lint.vim
@@ -19,9 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_golangci_lint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 
-        \ 'args_before':  'run',
-        \ })
+    let makeprg = self.makeprgBuild({ 'args_before':  'run' })
 
     let errorformat =
         \ '%f:%l:%c: %m,' .
@@ -32,7 +30,6 @@ function! SyntaxCheckers_go_golangci_lint_GetLocList() dict
         \ 'errorformat': errorformat,
         \ 'defaults': {'type': 'e'},
         \ 'subtype': 'Style' })
-
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({