瀏覽代碼

properly support terraform

Chris 4 年之前
父節點
當前提交
3ff9679e5a
共有 4 個文件被更改,包括 5 次插入6 次删除
  1. 1 0
      ftplugin/terraform.lua
  2. 0 1
      ftplugin/tf.lua
  3. 3 3
      lua/core/autocmds.lua
  4. 1 2
      lua/default-config.lua

+ 1 - 0
ftplugin/terraform.lua

@@ -0,0 +1 @@
+require("lsp").setup "terraform"

+ 0 - 1
ftplugin/tf.lua

@@ -1 +0,0 @@
-require("lsp").setup "tf"

+ 3 - 3
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" },

+ 1 - 2
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",