Refactor BufWrite/BufLeave autocmds

.config/nvim/init.vim

@@ -85,19 +85,36 @@ function TrimTrailingLines()
   call winrestview(view)
 endfunction
 
-augroup maximus
+function OnWrite()
+	if Writeable()
+		call CleanFile()
+	endif
+endfunction
 
-autocmd BufWrite * call TrimTrailingInvisibles() | call TrimTrailingLines()
+function OnLeave()
-autocmd BufLeave * if &buftype == ''
+	if Writeable()
+		call CleanFile()
+		write
+		GitGutter
+	endif
+endfunction
+
+function CleanFile()
+	call TrimTrailingInvisibles() | call TrimTrailingLines()
+endfunction
+
+function Writeable()
+	return &buftype == ''
 				\ && !&readonly
 				\ && &modifiable
 				\ && &modified
 				\ && expand("%:t") != ""
-			\ | call TrimTrailingInvisibles()
+endfunction
-			\ | call TrimTrailingLines()
+
-			\ | w
+augroup maximus
-			\ | GitGutter
+
-			\ | endif
+autocmd BufWrite * call OnWrite()
+autocmd BufLeave * call OnLeave()
 
 augroup END