From 5bc531578002f801d0a8ddd3e633b3ea086e1bf9 Mon Sep 17 00:00:00 2001
From: Billie Cleek <bhcleek@gmail.com>
Date: Mon, 6 Apr 2020 14:33:34 -0700
Subject: [PATCH 1/2] lint: fix function reference

Fix references to s:preserveerrors to avoid an error when using the
function reference.
---
 autoload/go/lint.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/go/lint.vim b/autoload/go/lint.vim
index c5e51218c3..89bc77261c 100644
--- a/autoload/go/lint.vim
+++ b/autoload/go/lint.vim
@@ -378,7 +378,7 @@ function! s:lint_job(metalinter, args, bang, autosave)
     let l:opts.for = "GoMetaLinterAutoSave"
     " s:metalinterautosavecomplete is really only needed for golangci-lint
     let l:opts.complete = funcref('s:metalinterautosavecomplete', [a:metalinter, expand('%:p:t')])
-    let l:opts.preserveerrors = function('s:preserveerrors')
+    let l:opts.preserveerrors = funcref('s:preserveerrors'), [a:autosave])
   endif
 
   " autowrite is not enabled for jobs

From cb1206b27ce99011539edb56593688efa8c81746 Mon Sep 17 00:00:00 2001
From: Billie Cleek <bhcleek@gmail.com>
Date: Mon, 6 Apr 2020 14:35:50 -0700
Subject: [PATCH 2/2] lint: allow errors to be cleared on save

* Allow errors to be cleared on save.
* Take a:autosave into account in s:preserveerrors so that errors won't
  be preserved unexpectedly.
* Normalize some strings relevant to this change to use single quoted
  strings instead of double quoted strings.

Fixes #2809
---
 autoload/go/fmt.vim  |  2 +-
 autoload/go/lint.vim | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/autoload/go/fmt.vim b/autoload/go/fmt.vim
index da2d45b0e1..d3a7d92f72 100644
--- a/autoload/go/fmt.vim
+++ b/autoload/go/fmt.vim
@@ -194,7 +194,7 @@ function! go#fmt#CleanErrors() abort
     let l:list_title = getloclist(0, {'title': 1})
   endif
 
-  if has_key(l:list_title, "title") && l:list_title['title'] == "Format"
+  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
diff --git a/autoload/go/lint.vim b/autoload/go/lint.vim
index 89bc77261c..47b5d4e73d 100644
--- a/autoload/go/lint.vim
+++ b/autoload/go/lint.vim
@@ -83,9 +83,11 @@ function! go#lint#Gometa(bang, autosave, ...) abort
   endif
 
   if a:autosave
-    let l:listtype = go#list#Type("GoMetaLinterAutoSave")
+    let l:listtype = go#list#Type('GoMetaLinterAutoSave')
+    let l:for = 'GoMetaLinterAutoSave'
   else
-    let l:listtype = go#list#Type("GoMetaLinter")
+    let l:listtype = go#list#Type('GoMetaLinter')
+    let l:for = 'GoMetaLinterAuto'
   endif
 
   if l:err == 0
@@ -100,7 +102,7 @@ function! go#lint#Gometa(bang, autosave, ...) abort
     if a:autosave
       call s:metalinterautosavecomplete(l:metalinter, fnamemodify(expand('%:p'), ":."), 0, 1, l:messages)
     endif
-    call go#list#ParseFormat(l:listtype, errformat, l:messages, 'GoMetaLinter', s:preserveerrors(a:autosave, l:listtype))
+    call go#list#ParseFormat(l:listtype, errformat, l:messages, l:for, s:preserveerrors(a:autosave, l:listtype))
 
     let errors = go#list#Get(l:listtype)
     call go#list#Window(l:listtype, len(errors))
@@ -370,15 +372,15 @@ function! s:lint_job(metalinter, args, bang, autosave)
   let l:opts = {
         \ 'statustype': a:args.statustype,
         \ 'errorformat': a:args.errformat,
-        \ 'for': "GoMetaLinter",
+        \ 'for': 'GoMetaLinter',
         \ 'bang': a:bang,
       \ }
 
   if a:autosave
-    let l:opts.for = "GoMetaLinterAutoSave"
+    let l:opts.for = 'GoMetaLinterAutoSave'
     " s:metalinterautosavecomplete is really only needed for golangci-lint
     let l:opts.complete = funcref('s:metalinterautosavecomplete', [a:metalinter, expand('%:p:t')])
-    let l:opts.preserveerrors = funcref('s:preserveerrors'), [a:autosave])
+    let l:opts.preserveerrors = funcref('s:preserveerrors', [a:autosave])
   endif
 
   " autowrite is not enabled for jobs
@@ -449,8 +451,8 @@ function! s:errorformat(metalinter) abort
 
 endfunction
 
-function! s:preserveerrors(listtype) abort
-  return a:listtype == go#list#Type("GoFmt") && go#config#FmtAutosave() && isdirectory(expand('%:p:h'))
+function! s:preserveerrors(autosave, listtype) abort
+  return a:autosave && a:listtype == go#list#Type("GoFmt") && go#config#FmtAutosave() && isdirectory(expand('%:p:h'))
 endfunction
 
 " restore Vi compatibility settings