From 3e03e37d9fd4bf4f844386085ae8765c4391f5a9 Mon Sep 17 00:00:00 2001 From: ray-x Date: Fri, 4 Mar 2022 17:25:27 +1100 Subject: [PATCH] update terraform setup --- lua/navigator/lspclient/clients.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua index 91f67b8..5668737 100644 --- a/lua/navigator/lspclient/clients.lua +++ b/lua/navigator/lspclient/clients.lua @@ -291,6 +291,9 @@ local setups = { omnisharp = { cmd = { 'omnisharp', '--languageserver', '--hostPID', tostring(vim.fn.getpid()) }, }, + terraformls = { + filetypes = { 'terraform', 'tf'}, + }, } setups.sumneko_lua = vim.tbl_deep_extend('force', luadev, setups.sumneko_lua) @@ -377,7 +380,9 @@ local function load_cfg(ft, client, cfg, loaded) end local lspft = lspconfig[client].document_config.default_config.filetypes + local additional_ft = setups[client] and setups[client].filetypes or {} local cmd = cfg.cmd + vim.list_extend(lspft, additional_ft) local should_load = false if lspft ~= nil and #lspft > 0 then @@ -698,6 +703,7 @@ local function setup(user_opts) 'defx', 'packer', 'gitcommit', + 'windline', } for i = 1, #disable_ft do if ft == disable_ft[i] or _LoadedFiletypes[ft] then @@ -716,7 +722,7 @@ local function setup(user_opts) local clients = vim.lsp.buf_get_clients(bufnr) for key, client in pairs(clients) do if client.name ~= "null_ls" and client.name ~= "efm" then - if vim.tbl_contains(client.filetypes, vim.o.ft) then + if vim.tbl_contains(client.filetypes or {}, vim.o.ft) then log('client already loaded', client.name) end end