From 30a6a2c6cf8483d20e8574276cf9d8865e6b61be Mon Sep 17 00:00:00 2001
From: "Billie H. Cleek" <bhcleek@gmail.com>
Date: Thu, 14 Jul 2016 20:05:39 -0700
Subject: [PATCH] allow auto features to be disabled without restarting Vim

---
 plugin/go.vim | 54 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/plugin/go.vim b/plugin/go.vim
index 3ba16d7efc..e3c1c3ebd1 100644
--- a/plugin/go.vim
+++ b/plugin/go.vim
@@ -143,44 +143,64 @@ function! s:echo_go_info()
   redraws! | echo "vim-go: " | echohl Function | echon item.info | echohl None
 endfunction
 
-augroup vim-go
-  autocmd!
-
-  " GoInfo automatic update
-  if get(g:, "go_auto_type_info", 0)
-    autocmd CursorHold *.go nested call go#complete#Info(1)
-  endif
-
+function! s:auto_sameids()
   " GoSameId automatic update
   if get(g:, "go_auto_sameids", 0)
-    autocmd CursorMoved *.go nested call go#guru#SameIds(-1)
+    call go#guru#SameIds(-1)
   endif
+endfunction
 
-  " Echo the identifier information when completion is done. Useful to see
-  " the signature of a function, etc...
-  if exists('##CompleteDone')
-    autocmd CompleteDone *.go nested call s:echo_go_info()
+function! s:auto_type_info()
+  " GoInfo automatic update
+  if get(g:, "go_auto_type_info", 0)
+    call go#complete#Info(1)
   endif
+endfunction
 
+function! s:fmt_autosave()
   " Go code formatting on save
   if get(g:, "go_fmt_autosave", 1)
-    autocmd BufWritePre *.go call go#fmt#Format(-1)
+    call go#fmt#Format(-1)
   endif
+endfunction
 
+function! s:asmfmt_autosave()
   " Go asm formatting on save
   if get(g:, "go_asmfmt_autosave", 1)
-    autocmd BufWritePre *.s call go#asmfmt#Format()
+    call go#asmfmt#Format()
   endif
+endfunction
 
+function! s:metalinter_autosave()
   " run gometalinter on save
   if get(g:, "go_metalinter_autosave", 0)
-    autocmd BufWritePost *.go call go#lint#Gometa(1)
+    call go#lint#Gometa(1)
   endif
+endfunction
 
+function! s:template_autocreate()
   " create new template from scratch
   if get(g:, "go_template_autocreate", 1)
-    autocmd BufNewFile *.go call go#template#create()
+    call go#template#create()
+  endif
+endfunction
+
+augroup vim-go
+  autocmd!
+
+  autocmd CursorHold *.go call s:auto_type_info()
+  autocmd CursorMoved *.go call s:auto_sameids()
+
+  " Echo the identifier information when completion is done. Useful to see
+  " the signature of a function, etc...
+  if exists('##CompleteDone')
+    autocmd CompleteDone *.go call s:echo_go_info()
   endif
+
+  autocmd BufWritePre *.go call s:fmt_autosave()
+  autocmd BufWritePre *.s call s:asmfmt_autosave()
+  autocmd BufWritePost *.go call s:metalinter_autosave()
+  autocmd BufNewFile *.go call s:template_autocreate()
 augroup END
 
 " vim: sw=2 ts=2 et