From 14f29a198150b727bfe83829ed00c47efa16f8b2 Mon Sep 17 00:00:00 2001 From: Rokas Puzonas Date: Sun, 31 Oct 2021 18:49:48 +0200 Subject: [PATCH] fix: try adding efm for lua formatting --- lua/config/lspconfig.lua | 17 +++++++++++++++++ lua/config/lspinstaller.lua | 2 ++ 2 files changed, 19 insertions(+) diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index 1ee8228..e68e007 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -4,7 +4,20 @@ local M = {} M.flags = { debounce_text_changes = 150 } local general_settings = { } +M.server_init_options = { + efm = {documentFormatting = true}, +} + M.server_settings = { + efm = { + rootMarkers = {".git/"}, + languages = { + lua = { + { formatCommand = "lua-format -i", formatStdin = true } + } + } + } + -- sumneko_lua = { -- Lua = { -- runtime = { @@ -90,6 +103,10 @@ function M.get_server_settings(name) return M.server_settings[name] end +function M.get_server_init_options(name) + return M.server_init_options[name] +end + ---@diagnostic disable-next-line: empty-block if packer_plugins['nvim-lsp-installer'] and packer_plugins['nvim-lsp-installer'].loaded then -- local lspconfig = require('lspconfig') diff --git a/lua/config/lspinstaller.lua b/lua/config/lspinstaller.lua index 5979663..3a5c00f 100644 --- a/lua/config/lspinstaller.lua +++ b/lua/config/lspinstaller.lua @@ -3,6 +3,7 @@ local lsp_instller = require 'nvim-lsp-installer' local lsp_installer_servers = require'nvim-lsp-installer.servers' local M = {} +-- local autoinstall_servers = {"sumneko_lua", "efm"} local autoinstall_servers = {"sumneko_lua"} for _, name in ipairs(autoinstall_servers) do local ok, server = lsp_installer_servers.get_server(name) @@ -15,6 +16,7 @@ local capabilities = lspconfig_config.get_capabilities() lsp_instller.on_server_ready(function(server) server:setup{ + init_options = lspconfig_config.get_server_init_options(server.name), on_attach = lspconfig_config.on_attach, on_init = lspconfig_config.on_init, flags = lspconfig_config.flags,