# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1620877580 18000
# Node ID 14c2238488ce879d5df3a6453f7c7e423055288e
# Parent  a568d7cb564d2e3c3d7d61395db1344ec3a29ea5
reinstate go format-on-write

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -368,13 +368,16 @@ augroup vim-lsp
       \ })
   endif
 
-  " GO111MODULE=off go get -u golang.org/x/tools/gopls mvdan.cc/gofumpt
+  " go install golang.org/x/tools/gopls@latest
+  " go install mvdan.cc/gofumpt@latest
   if executable('gopls')
     autocmd User lsp_setup call lsp#register_server({
       \ 'name': 'gopls',
       \ 'cmd': {server_info->['gopls']},
       \ 'whitelist': ['go'],
+      \ 'workspace_config': {'gopls': {'formatter.gofumpt': v:true}},
       \})
+    autocmd BufWritePre *.go LspDocumentFormatSync
   endif
 
   if executable('nimlsp')