feat(lsp): bind formatexpr and omnifunc by default (#2865)

This commit is contained in:
kylo252 2022-07-31 14:27:59 +02:00 committed by GitHub
parent 6ab3e8a739
commit dec21bbab6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions

View file

@ -8,7 +8,7 @@ return {
---@usage timeout number timeout in ms for the format request (Default: 1000)
timeout = 1000,
---@usage filter func to select client
filter = require("lvim.lsp.handlers").format_filter,
filter = require("lvim.lsp.utils").format_filter,
},
keys = {},

View file

@ -121,6 +121,12 @@ return {
insert_mode = {},
visual_mode = {},
},
buffer_options = {
--- enable completion triggered by <c-x><c-o>
omnifunc = "v:lua.vim.lsp.omnifunc",
--- use gq for formatting
formatexpr = "v:lua.vim.lsp.formatexpr(#{timeout_ms:500})",
},
---@usage list of settings of nvim-lsp-installer
installer = {
setup = {

View file

@ -3,6 +3,12 @@ local Log = require "lvim.core.log"
local utils = require "lvim.utils"
local autocmds = require "lvim.core.autocmds"
local function add_lsp_buffer_options(bufnr)
for k, v in pairs(lvim.lsp.buffer_options) do
vim.api.nvim_buf_set_option(bufnr, k, v)
end
end
local function add_lsp_buffer_keybindings(bufnr)
local mappings = {
normal_mode = "n",
@ -67,6 +73,7 @@ function M.common_on_attach(client, bufnr)
lu.setup_codelens_refresh(client, bufnr)
end
add_lsp_buffer_keybindings(bufnr)
add_lsp_buffer_options(bufnr)
end
function M.get_common_opts()

View file

@ -132,18 +132,20 @@ end
---filter passed to vim.lsp.buf.format
---always selects null-ls if it's available and caches the value per buffer
---@param client table client attached to a buffer
---@return table chosen clients
---@return boolean if client matches
function M.format_filter(client)
local filetype = vim.bo.filetype
local n = require "null-ls"
local s = require "null-ls.sources"
local method = n.methods.FORMATTING
local avalable_sources = s.get_available(filetype, method)
local avalable_formatters = s.get_available(filetype, method)
if #avalable_sources > 0 then
if #avalable_formatters > 0 then
return client.name == "null-ls"
else
elseif client.supports_method "textDocument/formatting" then
return true
else
return false
end
end
@ -159,6 +161,7 @@ function M.format(opts)
local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()
---@type table|nil
local clients = vim.lsp.get_active_clients {
id = opts.id,
bufnr = bufnr,