From 9a4a196b69be83409414d6aa23708ee2b922b43d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 26 May 2017 11:44:06 +0200
Subject: [PATCH] Refactor lang/go

---
 modules/lang/go/README.org  |  2 +-
 modules/lang/go/config.el   | 26 +++++++++++++-------------
 modules/lang/go/packages.el |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/lang/go/README.org b/modules/lang/go/README.org
index fcdad0078..4fd9ae885 100644
--- a/modules/lang/go/README.org
+++ b/modules/lang/go/README.org
@@ -34,7 +34,7 @@ sudo pacman --needed --noconfirm -S go
 ** Dependencies
 This module requires a valid ~GOPATH~, and the following Go packages:
 
-+ ~gocode~ (for code completion)
++ ~gocode~ (for code completion & eldoc support)
 + ~godoc~ (for documentation lookup)
 + ~goimports~ (for auto-formatting code on save and fixing imports)
 + ~gorename~ (for extra refactoring commands)
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index 45dd8b402..5fc86e1b4 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -45,6 +45,12 @@
             :n "n"  #'+go/test-nested))))
 
 
+(def-package! go-eldoc
+  :after go-mode
+  :commands go-eldoc-setup
+  :config (add-hook 'go-mode-hook #'go-eldoc-setup))
+
+
 (def-package! go-guru
   :commands (go-guru-describe go-guru-freevars go-guru-implements go-guru-peers
              go-guru-referrers go-guru-definition go-guru-pointsto
@@ -55,6 +61,13 @@
     (warn "go-mode: couldn't find guru, refactoring commands won't work")))
 
 
+(def-package! gorepl-mode
+  :commands (gorepl-run gorepl-run-load-current-file)
+  :config
+  (unless (executable-find "gore")
+    (warn "go-mode: couldn't find gore, REPL support disabled")))
+
+
 (def-package! company-go
   :when (featurep! :completion company)
   :after go-mode
@@ -62,16 +75,3 @@
   (if (executable-find command-go-gocode-command)
       (set! :company-backend 'go-mode '(company-go))
     (warn "go-mode: couldn't find gocode, code completion won't work")))
-
-
-(def-package! go-eldoc
-  :commands go-eldoc-setup
-  :init (add-hook 'go-mode-hook #'go-eldoc-setup))
-
-
-(def-package! gorepl-mode
-  :commands (gorepl-run gorepl-run-load-current-file)
-  :config
-  (unless (executable-find "gore")
-    (warn "go-mode: couldn't find gore, REPL support disabled")))
-
diff --git a/modules/lang/go/packages.el b/modules/lang/go/packages.el
index 9a2cc0316..09dba5325 100644
--- a/modules/lang/go/packages.el
+++ b/modules/lang/go/packages.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/go/packages.el
 
-(package! go-mode)
 (package! go-eldoc)
 (package! go-guru)
+(package! go-mode)
 (package! gorepl-mode)
 
 (when (featurep! :completion company)