Skip to content

refactor: lsp config #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
n3wborn merged 2 commits into from
Jun 26, 2026
Merged

refactor: lsp config #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2bdbc0
refactor: lsp config
n3wborn Jun 26, 2026
230d4e2
fix(lsp): prefer function call for keymaps, remove comments
n3wborn Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 96 additions & 58 deletions lua/config/lsp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,112 +1,150 @@
local servers = {
'bashls',
'gopls',
'jsonls',
-- emmylua_ls',
'lua_ls',
'kotlin_lsp',
'marksman',
'mpls',
'oxfmt',
-- 'intelephense',
'phpantom',
'tsgo',
'taplo',
'twiggy-language-server',
'v_analyzer',
'zls',
}

for _, server in ipairs(servers) do
vim.lsp.enable(server)
end

local signs = require('config.icons').diagnostics
local diagnostic_icons = require('config.icons').diagnostics

---@type vim.diagnostic.Opts
vim.diagnostic.config({
status = {
format = function(counts)
local items = {}
for severity, count in pairs(counts) do
local name = vim.diagnostic.severity[severity]
local hl = 'DiagnosticSign' .. name:sub(1, 1) .. name:sub(2):lower()
table.insert(items, ('%%#%s#%s %d'):format(hl, diagnostic_icons[name], count))
end
return table.concat(items, ' ')
end,
},

signs = {
text = {
[vim.diagnostic.severity.ERROR] = signs.Error,
[vim.diagnostic.severity.WARN] = signs.Warn,
[vim.diagnostic.severity.HINT] = signs.Hint,
[vim.diagnostic.severity.INFO] = signs.Info,
[vim.diagnostic.severity.ERROR] = diagnostic_icons.Error,
[vim.diagnostic.severity.WARN] = diagnostic_icons.Warn,
[vim.diagnostic.severity.HINT] = diagnostic_icons.Hint,
[vim.diagnostic.severity.INFO] = diagnostic_icons.Info,
},
},
severity_sort = true,
underline = false,
update_in_insert = true,
-- TODO: choose which one is better
-- update_in_insert = false,
float = true,
float = {
source = 'if_many',
-- Show severity icons as prefixes.
prefix = function(diag)
local level = vim.diagnostic.severity[diag.severity]
local prefix = string.format(' %s ', diagnostic_icons[level])
return prefix, 'Diagnostic' .. level:gsub('^%l', string.upper)
end,
},
jump = { on_jump = vim.diagnostic.open_float },
-- TODO: choose lines or text
virtual_lines = {
current_line = true,
severity = {
vim.diagnostic.severity.WARN,
vim.diagnostic.severity.ERROR,
},
},
-- virtual_text = {
-- current_line = true,
-- severity = {
-- vim.diagnostic.severity.WARN,
-- vim.diagnostic.severity.ERROR,
-- },
-- },
})

local lsp_group = vim.api.nvim_create_augroup('my.lsp', { clear = true })

vim.api.nvim_create_autocmd('LspAttach', {
group = lsp_group,
group = vim.api.nvim_create_augroup('my.lsp.keymaps', { clear = true }),
desc = 'LSP Keymaps',
callback = function(ev)
local client = assert(vim.lsp.get_client_by_id(ev.data.client_id))
local bufnr = ev.buf

local function map(mode, lhs, rhs, desc)
vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
if client:supports_method('textDocument/documentSymbol') then
vim.keymap.set({ 'n', 'x' }, '<leader>ss', function()
require('fzf-lua').lsp_document_symbols()
end, { desc = 'List Symbols' })
vim.keymap.set({ 'n', 'x' }, '<leader>sS', function()
require('fzf-lua').lsp_live_workspace_symbols()
end, { desc = 'List Workspace Symbols' })
end

map('n', '<leader>D', vim.diagnostic.open_float, 'Line diagnostics')
if client:supports_method('textDocument/definition') then
vim.keymap.set({ 'n' }, 'gd', function()
require('fzf-lua').lsp_definitions({ jump1 = true })
end, { desc = 'Go to Definition' })
vim.keymap.set({ 'n' }, 'gD', function()
require('fzf-lua').lsp_definitions({ jump1 = false })
end, { desc = 'Peek Definition' })
end

if client:supports_method('textDocument/references') then
vim.keymap.set({ 'n' }, 'grr', '<cmd>FzfLua lsp_references<cr>')
end

if client:supports_method('textDocument/onTypeFormatting') then
vim.lsp.on_type_formatting.enable(true, { bufnr = bufnr })
end

if client:supports_method('textDocument/documentColor') then
vim.lsp.document_color.enable(not vim.lsp.document_color.is_enabled())
vim.keymap.set({ 'n', 'x' }, 'grc', function()
vim.lsp.document_color.color_presentation()
end, { desc = 'Document Color Presentation' })
end

if client:supports_method('textDocument/inlayHint') and vim.g.lsp_inlay_hints then
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
end

if client:supports_method('textDocument/documentHighlight') then
local group = vim.api.nvim_create_augroup('lsp-highlight-' .. bufnr, { clear = true })
if client:supports_method('textDocument/signatureHelp') then
vim.keymap.set('i', '<C-k>', function()
-- Close the completion menu first (if open).
if require('blink.cmp.completion.windows.menu').win:is_open() then
require('blink.cmp').hide()
end

vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
vim.lsp.buf.signature_help()
end, { desc = 'Signature Help' })
end

if client:supports_method('textDocument/documentHighlight') then
local under_cursor_highlights_group =
vim.api.nvim_create_augroup('my.lsp.cursor_highlights', { clear = false })
vim.api.nvim_create_autocmd({ 'CursorHold', 'InsertLeave' }, {
group = under_cursor_highlights_group,
desc = 'Highlight references under the cursor',
buffer = bufnr,
group = group,
callback = vim.lsp.buf.document_highlight,
})

vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
vim.api.nvim_create_autocmd({ 'CursorMoved', 'InsertEnter', 'BufLeave' }, {
group = under_cursor_highlights_group,
desc = 'Clear highlight references',
buffer = bufnr,
group = group,
callback = vim.lsp.buf.clear_references,
})
end
end,
})

vim.api.nvim_create_autocmd('LspDetach', {
buffer = bufnr,
once = true,
callback = function()
vim.lsp.buf.clear_references()
vim.api.nvim_del_augroup_by_name('lsp-highlight-' .. bufnr)
end,
})
vim.api.nvim_create_autocmd({ 'BufReadPre', 'BufNewFile' }, {
once = true,
callback = function()
local servers = {
'bashls',
'gopls',
'jsonls',
-- emmylua_ls',
'lua_ls',
'kotlin_lsp',
'marksman',
'mpls',
'oxfmt',
-- 'intelephense',
'phpantom',
'tsgo',
'taplo',
'twiggy-language-server',
'v_analyzer',
'zls',
}

for _, server in ipairs(servers) do
vim.lsp.enable(server)
end
vim.lsp.enable(servers)
end,
})
34 changes: 6 additions & 28 deletions lua/plugins/fzf_lua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,6 @@ return {
cmd = 'FzfLua',
keys = {
{ '<space>F', ':FzfLua<cr>' },
{
'<leader>ss',
function()
require('fzf-lua').lsp_document_symbols()
end,
desc = 'Goto Symbol',
},
{
'<leader>sS',
function()
require('fzf-lua').lsp_live_workspace_symbols()
end,
desc = 'Goto Symbol (Workspace)',
},
{
'<leader>gd',
function()
require('fzf-lua').lsp_definitions()
end,
desc = 'Goto Definition',
},
{
'<leader>gf',
function()
require('fzf-lua').lsp_finder()
end,
desc = 'LSP finder',
},
{
'<leader>gi',
function()
Expand Down Expand Up @@ -110,6 +82,12 @@ return {
-- buffers = {
-- formatter = 'path.filename_first',
-- },
helptags = {
actions = {
-- Open help pages in a vertical split.
['enter'] = require('fzf-lua.actions').help_vert,
},
},
lsp = {
includeDeclaration = false, -- include current declaration in LSP context
symbols = {
Expand Down
Loading