From 47b157805d570c7001f987bfde644aafc723b5ba Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Sat, 25 Sep 2021 18:18:12 +0530 Subject: [PATCH] nvim: lsp: Fix enabling of range format support If range formatting is supported we should check that first to enable it else since most LSP servers support formatting, without range formatting check being first, it would never be enabled. --- nvim/.config/nvim/lua/lsp.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index 13582be..f1a63aa 100644 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua @@ -68,10 +68,10 @@ local on_attach = function(client, bufnr) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'do', 'lua vim.lsp.diagnostic.set_loclist()' , opts) vim.api.nvim_buf_set_keymap(bufnr, 'n', ',d', 'lua vim.lsp.diagnostic.show_line_diagnostics()' , opts) - if client.resolved_capabilities.document_formatting then - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', 'lua vim.lsp.buf.formatting()', opts) - elseif client.resolved_capabilities.document_range_formatting then + if client.resolved_capabilities.document_range_formatting then vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', 'lua format_range_operator()', opts) + elseif client.resolved_capabilities.document_formatting then + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gq', 'lua vim.lsp.buf.formatting()', opts) end if client.resolved_capabilities.code_lens then