From 9366f6072c8306d4bf86b20ca9ce9cc09818e4dd Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 25 Oct 2021 11:42:03 -0700 Subject: [PATCH] fix(lsp): auto format use sync --- lua/cosmic/config/config.lua | 13 +++++++------ lua/cosmic/lsp/providers/defaults.lua | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lua/cosmic/config/config.lua b/lua/cosmic/config/config.lua index 635736f..129465a 100644 --- a/lua/cosmic/config/config.lua +++ b/lua/cosmic/config/config.lua @@ -1,6 +1,7 @@ -- Override Cosmic configuration options --[[ + local config = {} config.statusline = { @@ -10,7 +11,7 @@ config.statusline = { config.lsp = { -- true/false or table of filetypes {'.ts', '.js',} - format_on_save = false, + format_on_save = true, servers = { @@ -20,18 +21,18 @@ config.lsp = { -- enable non-default servers (todo: support for custom server configs) rust_analyzer = true, - tsserver = { + tsserver = { -- disable formatting format = false, - } + }, efm = { -- specifc to efm, e.g. 'eslint', 'prettier', 'stylua' - disable_formatters = {}, + disable_formatters = {'eslint'}, }, - - } + }, } return config + ]] diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 4c2af60..6c3f04c 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/lua/cosmic/lsp/providers/defaults.lua @@ -25,7 +25,7 @@ function M.on_attach(client, bufnr) else format_filetypes = '*' end - vim.cmd(string.format('autocmd BufWritePre %s lua vim.lsp.buf.formatting()', format_filetypes)) + vim.cmd(string.format('autocmd BufWritePre %s lua vim.lsp.buf.formatting_sync(nil, 1000)', format_filetypes)) end else client.resolved_capabilities.document_formatting = false