From 68e0d2531d47cb544020033ef6ab54a2ad0e14bc Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Mon, 22 Jun 2026 16:46:28 +0200 Subject: [PATCH] feat: change to postgres-lsp for sql, open diagnostics bind --- nvim/lua/lsp-options.lua | 15 +++++++++++++-- nvim/lua/plugins/lsp/ls/sql.lua | 4 ++-- nvim/lua/plugins/lsp/lsp-lines.lua | 16 ---------------- nvim/lua/plugins/lsp/mason.lua | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) delete mode 100755 nvim/lua/plugins/lsp/lsp-lines.lua diff --git a/nvim/lua/lsp-options.lua b/nvim/lua/lsp-options.lua index b45a790..55daf09 100644 --- a/nvim/lua/lsp-options.lua +++ b/nvim/lua/lsp-options.lua @@ -19,12 +19,23 @@ M.on_attach = function(client, bufnr) opts.desc = "Go to previous diagnostic" keymap.set("n", "[d", function() - vim.diagnostic.jump({ count = -1 }) + vim.diagnostic.jump({ + count = -1, + on_jump = function() + vim.diagnostic.open_float() + end, + }) end, opts) + keymap.set("n", "?", vim.diagnostic.open_float, opts) opts.desc = "Go to next diagnostic" keymap.set("n", "]d", function() - vim.diagnostic.jump({ count = 1 }) + vim.diagnostic.jump({ + count = 1, + on_jump = function() + vim.diagnostic.open_float() + end, + }) end, opts) opts.desc = "Show documentation for what is under cursor" diff --git a/nvim/lua/plugins/lsp/ls/sql.lua b/nvim/lua/plugins/lsp/ls/sql.lua index 9a737c3..28505aa 100644 --- a/nvim/lua/plugins/lsp/ls/sql.lua +++ b/nvim/lua/plugins/lsp/ls/sql.lua @@ -6,7 +6,7 @@ local lsp = vim.lsp local capabilities = require("lsp-options").capabilities local on_attach = require("lsp-options").on_attach -lsp.config("sqlls", { +lsp.config("postgres_lsp", { capabilities = capabilities, on_attach = on_attach, }) @@ -14,4 +14,4 @@ lsp.config("sqlls", { -- ── Enable configs ─────────────────────────────────────────────── local enable = vim.lsp.enable -enable("sqlls") +enable("postgres_lsp") diff --git a/nvim/lua/plugins/lsp/lsp-lines.lua b/nvim/lua/plugins/lsp/lsp-lines.lua deleted file mode 100755 index 6b0114b..0000000 --- a/nvim/lua/plugins/lsp/lsp-lines.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - ---------- for lsp diagnostic lines ---------- - "https://git.sr.ht/~whynothugo/lsp_lines.nvim", - event = "LspAttach", - config = function() - require("lsp_lines").setup() - vim.diagnostic.config({ virtual_lines = false }) - - local lsplines = false - vim.keymap.set("n", "L", function() - lsplines = not lsplines - vim.diagnostic.config({ virtual_text = not lsplines }) - vim.diagnostic.config({ virtual_lines = lsplines }) - end, { desc = "Toggle lsp_lines" }) - end, -} diff --git a/nvim/lua/plugins/lsp/mason.lua b/nvim/lua/plugins/lsp/mason.lua index eb1f948..ce21962 100755 --- a/nvim/lua/plugins/lsp/mason.lua +++ b/nvim/lua/plugins/lsp/mason.lua @@ -40,10 +40,10 @@ return { "jsonls", "marksman", "lua_ls", + "postgres_lsp", "pyright", "rust_analyzer", "ruby_lsp", - "sqlls", "verible", "vtsls", "vue_ls",