mirror of
https://github.com/pojokcodeid/nvim-lazy.git
synced 2025-06-21 16:39:04 +02:00
enc: move lsp config to auto-lsp.nvim
This commit is contained in:
Pojok Code
parent
5f766a5717
commit
c09e320633
22 changed files with 253 additions and 293 deletions
|
|
@ -1,8 +1,9 @@
|
|||
return {
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"pojokcodeid/auto-lsp.nvim",
|
||||
event = { "VeryLazy", "BufReadPre", "BufNewFile", "BufRead" },
|
||||
dependencies = {
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
lazy = true,
|
||||
|
|
@ -72,66 +73,13 @@ return {
|
|||
vim.list_extend(opts.ensure_installed, servers)
|
||||
vim.list_extend(opts.skip_config, unregis_lsp)
|
||||
opts.automatic_installation = true
|
||||
opts.format_on_save = pcode.format_on_save or false -- config format on save none-ls
|
||||
opts.virtual_text = pcode.lsp_virtualtext or false
|
||||
opts.timeout_ms = pcode.format_timeout_ms or 5000
|
||||
return opts
|
||||
end,
|
||||
config = function(_, opts)
|
||||
require("mason-lspconfig").setup(opts)
|
||||
|
||||
local option = {}
|
||||
require("mason-lspconfig").setup_handlers({
|
||||
function(server_name) -- default handler (optional)
|
||||
local capabilities = require("user.lsp.handlers").capabilities
|
||||
if server_name == "clangd" then
|
||||
capabilities.offsetEncoding = { "utf-16" }
|
||||
end
|
||||
local is_skip = false
|
||||
local my_index = idxOf(opts.skip_config, server_name)
|
||||
if my_index ~= nil then
|
||||
is_skip = true
|
||||
end
|
||||
if not is_skip then
|
||||
option = {
|
||||
on_attach = require("user.lsp.handlers").on_attach,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
|
||||
server_name = vim.split(server_name, "@")[1]
|
||||
|
||||
local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server_name)
|
||||
if require_ok then
|
||||
option = vim.tbl_deep_extend("force", conf_opts, option)
|
||||
end
|
||||
require("lspconfig")[server_name].setup(option)
|
||||
end
|
||||
end,
|
||||
-- ["jdtls"] = function()
|
||||
-- require("lspconfig").jdtls.setup({
|
||||
-- on_attach = require("user.lsp.handlers").on_attach,
|
||||
-- capabilities = require("user.lsp.handlers").capabilities,
|
||||
-- cmd = {
|
||||
-- "jdtls",
|
||||
-- "-configuration",
|
||||
-- vim.fn.expand("$HOME") .. "/.cache/jdtls/config",
|
||||
-- "-data",
|
||||
-- vim.fn.expand("$HOME") .. "/.cache/jdtls/workspace",
|
||||
-- },
|
||||
-- filetypes = { "java" },
|
||||
-- root_dir = require("lspconfig.util").root_pattern(
|
||||
-- -- Single-module projects
|
||||
-- {
|
||||
-- "build.xml", -- Ant
|
||||
-- "pom.xml", -- Maven
|
||||
-- "settings.gradle", -- Gradle
|
||||
-- "settings.gradle.kts", -- Gradle
|
||||
-- },
|
||||
-- -- Multi-module projects
|
||||
-- { "build.gradle", "build.gradle.kts" }
|
||||
-- ) or vim.fn.getcwd(),
|
||||
-- singe_file_support = true,
|
||||
-- })
|
||||
-- end,
|
||||
})
|
||||
require("user.lsp.handlers").setup()
|
||||
require("auto-lsp").setup(opts)
|
||||
end,
|
||||
keys = {
|
||||
{ "<leader>l", "", desc = " LSP", mode = "n" },
|
||||
|
|
|
|||
|
|
@ -117,7 +117,8 @@ if pcode.active_java_config.active then
|
|||
},
|
||||
settings = opts.settings,
|
||||
-- enable CMP capabilities
|
||||
capabilities = require("user.lsp.handlers").capabilities or nil,
|
||||
-- capabilities = require("user.lsp.handlers").capabilities or nil,
|
||||
capabilities = require("auto-lsp.lsp.handlers").capabilities or nil,
|
||||
}, opts.jdtls)
|
||||
|
||||
-- Existing server will be reused if the root_dir matches.
|
||||
|
|
@ -138,31 +139,39 @@ if pcode.active_java_config.active then
|
|||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if client and client.name == "jdtls" then
|
||||
local wk = require("which-key")
|
||||
wk.register({
|
||||
["<leader>c"] = { name = "+code" },
|
||||
["<leader>cx"] = { name = "+extract" },
|
||||
["<leader>cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" },
|
||||
["<leader>cxc"] = { require("jdtls").extract_constant, "Extract Constant" },
|
||||
["gs"] = { require("jdtls").super_implementation, "Goto Super" },
|
||||
["<leader>co"] = { require("jdtls").organize_imports, "Organize Imports" },
|
||||
}, { mode = "n", buffer = args.buf })
|
||||
wk.register({
|
||||
["<leader>c"] = { name = "+code" },
|
||||
["<leader>cx"] = { name = "+extract" },
|
||||
["<leader>cxm"] = {
|
||||
[[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]],
|
||||
"Extract Method",
|
||||
wk.add({
|
||||
{
|
||||
mode = "n",
|
||||
buffer = args.buf,
|
||||
{ "<leader>cx", group = "extract" },
|
||||
{ "<leader>cxv", require("jdtls").extract_variable_all, desc = "Extract Variable" },
|
||||
{ "<leader>cxc", require("jdtls").extract_constant, desc = "Extract Constant" },
|
||||
{ "gs", require("jdtls").super_implementation, desc = "Goto Super" },
|
||||
{ "<leader>co", require("jdtls").organize_imports, desc = "Organize Imports" },
|
||||
},
|
||||
["<leader>cxv"] = {
|
||||
[[<ESC><CMD>lua require('jdtls').extract_variable_all(true)<CR>]],
|
||||
"Extract Variable",
|
||||
})
|
||||
wk.add({
|
||||
{
|
||||
mode = "v",
|
||||
buffer = args.buf,
|
||||
{ "<leader>cx", group = "extract" },
|
||||
{
|
||||
"<leader>cxm",
|
||||
[[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]],
|
||||
desc = "Extract Method",
|
||||
},
|
||||
{
|
||||
"<leader>cxv",
|
||||
[[<ESC><CMD>lua require('jdtls').extract_variable_all(true)<CR>]],
|
||||
desc = "Extract Variable",
|
||||
},
|
||||
{
|
||||
"<leader>cxc",
|
||||
[[<ESC><CMD>lua require('jdtls').extract_constant(true)<CR>]],
|
||||
desc = "Extract Constant",
|
||||
},
|
||||
},
|
||||
["<leader>cxc"] = {
|
||||
[[<ESC><CMD>lua require('jdtls').extract_constant(true)<CR>]],
|
||||
"Extract Constant",
|
||||
},
|
||||
}, { mode = "v", buffer = args.buf })
|
||||
|
||||
})
|
||||
if opts.dap and mason_registry.is_installed("java-debug-adapter") then
|
||||
-- custom init for Java debugger
|
||||
require("jdtls").setup_dap(opts.dap)
|
||||
|
|
|
|||
|
|
@ -52,8 +52,10 @@ if pcode.active_rust_config then
|
|||
ft = { "rust" },
|
||||
dependencies = "neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
local on_attach = require("user.lsp.handlers").on_attach
|
||||
local capabilities = require("user.lsp.handlers").capabilities
|
||||
-- local on_attach = require("user.lsp.handlers").on_attach
|
||||
-- local capabilities = require("user.lsp.handlers").capabilities
|
||||
local on_attach = require("auto-lsp.lsp.handlers").on_attach
|
||||
local capabilities = require("auto-lsp.lsp.handlers").capabilities
|
||||
|
||||
vim.g.rustaceanvim = {
|
||||
server = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue