Let lsp handle gofmt

2 files changed, 7 insertions, 13 deletions

diff --git a/lisp/init-go-mode.el b/lisp/init-go-mode.el
index e278239..2ea28cc 100644
--- a/lisp/init-go-mode.el
+++ b/lisp/init-go-mode.el
@@ -1,16 +1,6 @@
 (use-package go-mode
   :init
-  ;; use goimports if available
-  (when (executable-find "goimports")
-    (setq gofmt-command "goimports"))
-
-  :bind (:map go-mode-map
-         ;; C-c p runs gofmt on the buffer
-         ("C-c p" . gofmt))
-
   :config
-  ;; run gofmt before saving file
-  (add-hook 'before-save-hook 'gofmt-before-save)
   (add-hook 'go-mode-hook
             (lambda ()
               ;; adjust fill-column
diff --git a/lisp/init-lsp-mode.el b/lisp/init-lsp-mode.el
index 5b10081..7276a15 100644
--- a/lisp/init-lsp-mode.el
+++ b/lisp/init-lsp-mode.el
@@ -1,5 +1,5 @@
 (use-package lsp-mode
-  :commands lsp
+  :commands (lsp lsp-format-buffer)
   :init
   ;; disable yasnippet support
   (setq lsp-enable-snippet nil)
@@ -7,10 +7,14 @@
   (setq lsp-prefer-flymake nil)
   :hook
   ;; enable lsp in go-mode
-  (go-mode . lsp)
+  ((go-mode . lsp)
+   ;; reformat on save
+   (before-save . lsp-format-buffer))
   :bind (:map lsp-mode-map
               ;; C-c r renames identifier
-              ("C-c r" . lsp-rename)))
+              ("C-c r" . lsp-rename)
+              ;; C-c p reformats buffer
+              ("C-c p" . lsp-format-buffer)))
 
 (use-package lsp-ui
   :commands lsp-ui-mode