From dbd4e45a413a2339699fb6fe73020a9330c5bc66 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 19 Apr 2016 02:10:43 -0400
Subject: [PATCH] go: add REPL + refactor config

---
 Cask                 |  1 +
 modules/module-go.el | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cask b/Cask
index bc879dc6d..74129b62f 100644
--- a/Cask
+++ b/Cask
@@ -149,6 +149,7 @@
 (depends-on "go-mode")
 (depends-on "go-eldoc")
 (depends-on "company-go")
+(depends-on "gorepl-mode")
 
 ;; Haskell -- modules/module-haskell.el
 (depends-on "haskell-mode")
diff --git a/modules/module-go.el b/modules/module-go.el
index 4a4982fda..80ee0ce99 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -1,13 +1,16 @@
 ;;; module-go.el
 
+(use-package gorepl-mode :commands (gorepl-run gorepl-run-load-current-file))
+
 (use-package go-mode
   :mode "\\.go$"
   :interpreter "go"
   :init
-  (add-hook! go-mode '(emr-initialize narf|flycheck-enable-maybe))
-  :config
+  (add-hook! go-mode '(emr-initialize flycheck-mode))
   (define-builder! go-mode "go build")
+  (define-repl! go-mode gorepl-run)
 
+  :config
   (after! emr
     (mapc (lambda (x)
             (let ((command-name (car x))
@@ -26,12 +29,11 @@
   (after! helm
     (use-package helm-go-package :defer t))
 
-  (use-package go-eldoc
-    :config (add-hook 'go-mode-hook 'go-eldoc-setup))
+  (require 'go-eldoc)
+  (add-hook 'go-mode-hook 'go-eldoc-setup)
 
-  (use-package company-go
-    :config
-    (define-company-backend! go-mode (go yasnippet)))
+  (require 'company-go)
+  (define-company-backend! go-mode (go yasnippet))
 
   (map! :map go-mode-map
         :n "gd" 'godef-jump