From 42ed25d16558bbfa49bbd10bedcbaaa1d5b9d414 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 14 Apr 2023 01:54:18 +0100 Subject: [PATCH] feat(language/terraform): use lsp-mode in terraform buffers --- modules/languages/siren-terraform.el | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/languages/siren-terraform.el b/modules/languages/siren-terraform.el index b9fbf06..bcd3b37 100644 --- a/modules/languages/siren-terraform.el +++ b/modules/languages/siren-terraform.el @@ -18,8 +18,7 @@ :preface (defun siren-terraform-mode-setup () - (setq-local tab-width 2) - (terraform-format-on-save-mode 1)) + (setq-local tab-width 2)) :config ;; This does a better job of injecting formatted content than the default @@ -29,6 +28,21 @@ :args '("fmt" "-no-color" "-") :lighter " fmt")) +(use-package lsp-terraform + :straight lsp-mode + :hook + (terraform-mode . siren-lsp-rust-mode-setup) + + :preface + (defun siren-lsp-rust-mode-setup () + ;; Disable semantic tokens as it typically causes an annoying delay with the + ;; syntax highlighting as you type. Essentially all new text is a very faded + ;; out grey color for the first 1-2 seconds as you type. + (setq-local lsp-semantic-tokens-enable nil) + + (lsp-format-buffer-on-save-mode t) + (lsp-deferred))) + (use-package terraform-doc :defer t)