From 3ff9679e5ad64410fc39bfa5667fdcf91f3a4140 Mon Sep 17 00:00:00 2001
From: Chris <chris@macbook.local>
Date: Thu, 29 Jul 2021 00:51:50 -0400
Subject: [PATCH] properly support terraform

---
 ftplugin/terraform.lua | 1 +
 ftplugin/tf.lua        | 1 -
 lua/core/autocmds.lua  | 6 +++---
 lua/default-config.lua | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 ftplugin/terraform.lua
 delete mode 100644 ftplugin/tf.lua

diff --git a/ftplugin/terraform.lua b/ftplugin/terraform.lua
new file mode 100644
index 00000000..3486663d
--- /dev/null
+++ b/ftplugin/terraform.lua
@@ -0,0 +1 @@
+require("lsp").setup "terraform"
diff --git a/ftplugin/tf.lua b/ftplugin/tf.lua
deleted file mode 100644
index 8d0e45c5..00000000
--- a/ftplugin/tf.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "tf"
diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua
index d77e0e71..89590454 100644
--- a/lua/core/autocmds.lua
+++ b/lua/core/autocmds.lua
@@ -36,9 +36,9 @@ lvim.autocommands = {
     -- { "VimLeavePre", "*", "set title set titleold=" },
   },
   _filetypechanges = {
-    -- { "BufWinEnter", ".tf", "setlocal filetype=terraform" },
-    -- { "BufRead", "*.tf", "setlocal filetype=terraform" },
-    -- { "BufNewFile", "*.tf", "setlocal filetype=terraform" },
+    { "BufWinEnter", ".tf", "setlocal filetype=terraform" },
+    { "BufRead", "*.tf", "setlocal filetype=terraform" },
+    { "BufNewFile", "*.tf", "setlocal filetype=terraform" },
     { "BufWinEnter", ".zsh", "setlocal filetype=sh" },
     { "BufRead", "*.zsh", "setlocal filetype=sh" },
     { "BufNewFile", "*.zsh", "setlocal filetype=sh" },
diff --git a/lua/default-config.lua b/lua/default-config.lua
index 3bfc7649..25c6dcef 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -851,7 +851,7 @@ lvim.lang = {
       "typescriptreact",
     },
   },
-  tf = {
+  terraform = {
     formatter = {
       exe = "terraform_fmt",
       args = {},
@@ -860,7 +860,6 @@ lvim.lang = {
     lsp = {
       provider = "terraformls",
       setup = {
-        filetypes = { "terraform", "tf" },
         cmd = {
           DATA_PATH .. "/lspinstall/terraform/terraform-ls",
           "serve",