diff options
| author | Chris <[email protected]> | 2021-07-29 00:51:50 -0400 |
|---|---|---|
| committer | Chris <[email protected]> | 2021-07-29 00:51:50 -0400 |
| commit | 3ff9679e5ad64410fc39bfa5667fdcf91f3a4140 (patch) | |
| tree | 6c38c0e6b67dd77e92479141d71abd14920a1da3 | |
| parent | d1ca23af3448f2e60b2b33d35d4f26028b457d56 (diff) | |
properly support terraform0.5.1
| -rw-r--r-- | ftplugin/terraform.lua | 1 | ||||
| -rw-r--r-- | ftplugin/tf.lua | 1 | ||||
| -rw-r--r-- | lua/core/autocmds.lua | 6 | ||||
| -rw-r--r-- | lua/default-config.lua | 3 |
4 files changed, 5 insertions, 6 deletions
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", |