From 81259b3442a284a2511b388c65021c50f70ace0e Mon Sep 17 00:00:00 2001 From: Terin Stock Date: Thu, 21 Apr 2022 21:53:35 -0500 Subject: config(lsp): migrate to eglot from lsp-mode --- lang/go.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lang/go.el') diff --git a/lang/go.el b/lang/go.el index 654b19f..199053d 100644 --- a/lang/go.el +++ b/lang/go.el @@ -1,11 +1,15 @@ ;;; lang/go.el -*- lexical-binding: t; -*- -(after! lsp - (lsp-register-custom-settings - '(("gopls.staticcheck" t t)))) +(defun +eglot-organize-imports () + (call-interactively 'eglot-code-action-organize-imports)) -(setq-hook! 'go-mode-hook +format-with :none) +(when (featurep! :tools lsp +eglot) + (after! eglot + (add-to-list 'eglot-workspace-configuration + `((:gopls . ((staticcheck . t)))))) -(add-hook! 'go-mode-hook - (add-hook 'before-save-hook 'lsp-format-buffer t t) - (add-hook 'before-save-hook 'lsp-organize-imports t t)) + (setq-hook! 'go-mode-hook +format-with :none) + + (add-hook! 'go-mode-hook + (add-hook 'before-save-hook #'eglot-format-buffer -30 t) + (add-hook 'before-save-hook #'+eglot-organize-imports -20 t))) -- cgit v1.2.3