Skip to content

Commit

Permalink
refactor(lsp): remove unneeded extra file
Browse files Browse the repository at this point in the history
  • Loading branch information
Kibadda committed Aug 30, 2024
1 parent 3a2d7a9 commit 85456bc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 50 deletions.
46 changes: 0 additions & 46 deletions nvim/lua/me/lsp/init.lua

This file was deleted.

30 changes: 26 additions & 4 deletions nvim/plugin/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,31 @@ vim.diagnostic.config {
require "me.lsp.attach"
require "me.lsp.progress"

local lsp = require "me.lsp"
for _, server in ipairs(require "me.lsp.servers") do
lsp.register(server)
local group = vim.api.nvim_create_augroup("LspServers", { clear = true })

---@class me.lsp.ServerConfig
---@field filetypes string[]
---@field root_markers string[]
---@field config vim.lsp.ClientConfig

---@param server me.lsp.ServerConfig
local function register(server)
server.config.name = server.config.name or server.config.cmd[1]

server.config.capabilities =
vim.tbl_deep_extend("force", vim.lsp.protocol.make_client_capabilities(), server.config.capabilities or {})

vim.api.nvim_create_autocmd("FileType", {
group = group,
pattern = server.filetypes,
callback = function(args)
vim.lsp.start(vim.tbl_deep_extend("keep", {
root_dir = vim.fs.root(args.buf, server.root_markers),
}, server.config))
end,
})
end

-- require("me.snippetls").register()
for _, server in ipairs(require "me.lsp.servers") do
register(server)
end

0 comments on commit 85456bc

Please sign in to comment.