From 5a464d65624deb98a59fef25c657950cb1a1a7e0 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sun, 16 Jan 2022 11:56:50 +0000 Subject: [PATCH] chore(languages): simplify terraform configuration lsp-mode now supports terraform-lsp and terraform-ls, so there's no need to define a custom language server for terraform-ls. --- modules/languages/siren-terraform.el | 34 +++++++--------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/modules/languages/siren-terraform.el b/modules/languages/siren-terraform.el index 319dcaf..4d61987 100644 --- a/modules/languages/siren-terraform.el +++ b/modules/languages/siren-terraform.el @@ -20,34 +20,16 @@ :init (defun siren-terraform-mode-setup () (setq-local tab-width 2) - (terraform-format-on-save-mode 1)) - - (defun siren-define-terraform-format-mode () - ;; This does a better job of injecting formatted content than the default - ;; formatting commands included with terraform-mode. - (reformatter-define terraform-format - :program "terraform" - :args '("fmt" "-no-color" "-") - :lighter " TF")) + (terraform-format-on-save-mode 1) + (lsp-deferred)) :config - (siren-define-terraform-format-mode) - - ;; When terraform-ls CLI tool is available, setup lsp-mode to use it - (when (executable-find "terraform-ls") - (with-eval-after-load 'lsp-mode - ;; Disable terraform client included with lsp-mode, because it uses - ;; terraform-lsp which I have not managed to get working. - (add-to-list 'lsp-disabled-clients 'tfls) - - (lsp-register-client - (make-lsp-client - :new-connection (lsp-stdio-connection '("terraform-ls" "serve")) - :major-modes '(terraform-mode) - :priority 1 - :server-id 'terraform-ls)) - - (add-hook 'terraform-mode-hook #'lsp-deferred)))) + ;; This does a better job of injecting formatted content than the default + ;; formatting commands included with terraform-mode. + (reformatter-define terraform-format + :program "terraform" + :args '("fmt" "-no-color" "-") + :lighter " TF")) (use-package terraform-doc :defer t)