From 10fa205e347940afc6b44af2089b189e76f63b17 Mon Sep 17 00:00:00 2001 From: Daniil Tsivinsky Date: Wed, 8 Jun 2022 10:28:10 +0300 Subject: [PATCH] add utils.lsp_format function with disabled tsserver --- neovim/.config/nvim/lua/user/lsp.lua | 3 ++- neovim/.config/nvim/lua/user/remaps.lua | 2 +- neovim/.config/nvim/lua/user/utils.lua | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/neovim/.config/nvim/lua/user/lsp.lua b/neovim/.config/nvim/lua/user/lsp.lua index dc685b1..69059fd 100644 --- a/neovim/.config/nvim/lua/user/lsp.lua +++ b/neovim/.config/nvim/lua/user/lsp.lua @@ -2,6 +2,7 @@ local lsp_installer = require("nvim-lsp-installer") local lspconfig = require("lspconfig") local null_ls = require("null-ls") local util = require("lspconfig").util +local u = require("user.utils") local formatting = null_ls.builtins.formatting local diagnostics = null_ls.builtins.diagnostics @@ -41,7 +42,7 @@ null_ls.setup({ pattern = "*", group = group, callback = function() - vim.lsp.buf.format() + u.lsp_format() end, }) end, diff --git a/neovim/.config/nvim/lua/user/remaps.lua b/neovim/.config/nvim/lua/user/remaps.lua index 7ec26ca..860d62f 100644 --- a/neovim/.config/nvim/lua/user/remaps.lua +++ b/neovim/.config/nvim/lua/user/remaps.lua @@ -116,7 +116,7 @@ vim.keymap.set("n", "ri", function() u.lsp_organize_imports() end) vim.keymap.set("n", "rf", function() - vim.lsp.buf.format() + u.lsp_format() end) -- package-info diff --git a/neovim/.config/nvim/lua/user/utils.lua b/neovim/.config/nvim/lua/user/utils.lua index c7b0af0..b4a0aed 100644 --- a/neovim/.config/nvim/lua/user/utils.lua +++ b/neovim/.config/nvim/lua/user/utils.lua @@ -71,4 +71,19 @@ M.open_url_in_browser = function(url) f:close() end +function M.lsp_format(bufnr) + bufnr = bufnr or 0 + + vim.lsp.buf.format({ + filter = function(client) + if client.name == "tsserver" then + return false + end + + return true + end, + bufnr = bufnr, + }) +end + return M