From c917502823b09eea9d6878c29d2931257369edb6 Mon Sep 17 00:00:00 2001 From: Tyler Hampton Date: Mon, 17 Feb 2020 20:28:03 -0800 Subject: [PATCH 1/3] Add LSP server activation behind feature flag --- modules/tools/terraform/config.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/tools/terraform/config.el b/modules/tools/terraform/config.el index e6ca17f5e..4f1fcc9d6 100644 --- a/modules/tools/terraform/config.el +++ b/modules/tools/terraform/config.el @@ -13,3 +13,8 @@ :after terraform-mode :config (set-company-backend! 'terraform-mode 'company-terraform)) + + +(after! terraform-mode + (if (featurep! +lsp) + (add-hook 'terraform-mode-local-vars-hook #'lsp!)) From 67a8c75b721aae3220e67846f1885817b2e87c74 Mon Sep 17 00:00:00 2001 From: Tyler Hampton Date: Mon, 17 Feb 2020 22:18:05 -0800 Subject: [PATCH 2/3] Fix indentation and remove if --- modules/tools/terraform/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/tools/terraform/config.el b/modules/tools/terraform/config.el index 4f1fcc9d6..24b129281 100644 --- a/modules/tools/terraform/config.el +++ b/modules/tools/terraform/config.el @@ -1,5 +1,9 @@ ;;; tools/terraform/config.el -*- lexical-binding: t; -*- +(when (featurep! +lsp) + (add-hook 'terraform-mode-local-vars-hook #'lsp!) + + (map! :after terraform-mode :map terraform-mode-map :localleader From 4cca1783761a2fc8b8cd448da51d0664a2b43c35 Mon Sep 17 00:00:00 2001 From: Tyler Hampton Date: Mon, 17 Feb 2020 22:36:31 -0800 Subject: [PATCH 3/3] Remove previous block --- modules/tools/terraform/config.el | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/tools/terraform/config.el b/modules/tools/terraform/config.el index 24b129281..1166d1c2c 100644 --- a/modules/tools/terraform/config.el +++ b/modules/tools/terraform/config.el @@ -17,8 +17,3 @@ :after terraform-mode :config (set-company-backend! 'terraform-mode 'company-terraform)) - - -(after! terraform-mode - (if (featurep! +lsp) - (add-hook 'terraform-mode-local-vars-hook #'lsp!))