From f5e84d6dcc77bdaafd2539416854151e994496db Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 27 May 2023 15:19:08 -0400 Subject: [PATCH] Update go for emacs29. --- ansible/roles/emacs/files/init.el | 2 +- ansible/roles/emacs/files/lang-go.el | 16 ++++++++++++---- ansible/roles/emacs/tasks/linux.yaml | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ansible/roles/emacs/files/init.el b/ansible/roles/emacs/files/init.el index 655fd32..2e8ba74 100644 --- a/ansible/roles/emacs/files/init.el +++ b/ansible/roles/emacs/files/init.el @@ -26,7 +26,7 @@ (require 'lang-terraform) -;; (require 'lang-go) +(require 'lang-go) ;; (require 'lang-c) diff --git a/ansible/roles/emacs/files/lang-go.el b/ansible/roles/emacs/files/lang-go.el index 0e77df2..187fe20 100644 --- a/ansible/roles/emacs/files/lang-go.el +++ b/ansible/roles/emacs/files/lang-go.el @@ -2,14 +2,22 @@ (require 'util-tree-sitter) (use-package go-mode - :commands go-mode + :pin nongnu + :commands (go-mode go-ts-mode) :hook ( - (go-mode . (lambda () - (eglot-ensure) - (tree-sitter-hl-mode +1) + (go-ts-mode . (lambda () + (when-linux + (eglot-ensure) + ) )) ;; (before-save . lsp-format-buffer) ) + :init + (add-to-list 'major-mode-remap-alist '(go-mode . go-ts-mode)) + (add-to-list 'treesit-language-source-alist '(go "https://github.com/tree-sitter/tree-sitter-go")) + (add-to-list 'treesit-language-source-alist '(gomod "https://github.com/camdencheek/tree-sitter-go-mod")) + (unless (treesit-ready-p 'go) (treesit-install-language-grammar 'go)) + (unless (treesit-ready-p 'gomod) (treesit-install-language-grammar 'gomod)) ) (provide 'lang-go) diff --git a/ansible/roles/emacs/tasks/linux.yaml b/ansible/roles/emacs/tasks/linux.yaml index c7a3877..b5e48cf 100644 --- a/ansible/roles/emacs/tasks/linux.yaml +++ b/ansible/roles/emacs/tasks/linux.yaml @@ -4,4 +4,5 @@ - aspell-en - prettier # typescript+yaml formatting - pyright + - gopls state: present