changing kick overrides pattern
This commit is contained in:
dlond
parent
049d9f270a
commit
3bab682273
8 changed files with 189 additions and 379 deletions
|
|
@ -74,9 +74,10 @@ return {
|
|||
type = 'lldb',
|
||||
request = 'launch',
|
||||
program = function()
|
||||
local utils = require 'custom.utils'
|
||||
local target = utils:get_target()
|
||||
return utils.pick_executable(vim.fn.getcwd() .. '/' .. target)
|
||||
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
|
||||
-- local utils = require 'custom.utils'
|
||||
-- local target = utils:get_target()
|
||||
-- return utils.pick_executable(vim.fn.getcwd() .. '/' .. target)
|
||||
end,
|
||||
cwd = '${workspaceFolder}',
|
||||
stopOnEntry = false,
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ return {
|
|||
require('nvim-web-devicons').setup()
|
||||
end,
|
||||
},
|
||||
{ import = 'custom.plugins.completion' },
|
||||
{ import = 'custom.plugins.debug' },
|
||||
{ import = 'custom.plugins.formatting' },
|
||||
-- { import = 'custom.plugins.completion' },
|
||||
-- { import = 'custom.plugins.debug' },
|
||||
-- { import = 'custom.plugins.formatting' },
|
||||
{ import = 'custom.plugins.lsp' },
|
||||
{ import = 'custom.plugins.nvim-tmux-navigator' },
|
||||
{ import = 'custom.plugins.telescope' },
|
||||
{ import = 'custom.plugins.theme' },
|
||||
{ import = 'custom.plugins.treesitter' },
|
||||
-- { import = 'custom.plugins.nvim-tmux-navigator' },
|
||||
-- { import = 'custom.plugins.telescope' },
|
||||
-- { import = 'custom.plugins.theme' },
|
||||
-- { import = 'custom.plugins.treesitter' },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,176 +1,38 @@
|
|||
-- ~/dlond/nvim/lua/custom/plugins/lsp.lua
|
||||
-- LSP configuration, assuming LSP servers are installed via Nix/Home Manager
|
||||
|
||||
return {
|
||||
-- ========================================
|
||||
-- LSP Configuration (LSP servers provided by Nix/Home Manager)
|
||||
-- ========================================
|
||||
{
|
||||
'neovim/nvim-lspconfig',
|
||||
event = { 'BufReadPre', 'BufNewFile' }, -- Load LSP config early
|
||||
dependencies = {
|
||||
{ 'j-hui/fidget.nvim', opts = {} }, -- Useful status updates for LSP
|
||||
'hrsh7th/cmp-nvim-lsp', -- LSP completion source for nvim-cmp
|
||||
local lspconfig = require 'lspconfig'
|
||||
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||
|
||||
local servers = {
|
||||
pyright = {
|
||||
settings = {
|
||||
python = {
|
||||
analysis = {
|
||||
autoSearchPaths = true,
|
||||
diagnosticMode = 'openFilesOnly',
|
||||
useLibraryCodeForTypes = true,
|
||||
typeCheckingMode = 'basic',
|
||||
},
|
||||
},
|
||||
positionEncoding = 'utf-8',
|
||||
},
|
||||
config = function(_, opts)
|
||||
-- This config function runs AFTER the plugin and its dependencies are loaded.
|
||||
-- It sets up the LSP servers.
|
||||
|
||||
-- Get LSP capabilities, augmented by nvim-cmp
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
|
||||
-- Define the list of LSP servers you want to configure.
|
||||
-- These servers must be installed via Nix/Home Manager and be in your PATH.
|
||||
local utils = require 'custom.utils'
|
||||
local target = utils:get_target()
|
||||
local servers = {
|
||||
lua_ls = {
|
||||
-- cmd = { ... }
|
||||
-- filetypes = { ... }
|
||||
-- capabilities = {}
|
||||
settings = {
|
||||
Lua = {
|
||||
completion = {
|
||||
callSnippet = 'Replace',
|
||||
},
|
||||
diagnostics = { disable = { 'missing-fields' } },
|
||||
},
|
||||
},
|
||||
},
|
||||
clangd = {
|
||||
cmd = utils.make_clangd_cmd(target),
|
||||
filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' },
|
||||
root_dir = require('lspconfig.util').root_pattern('CMakeLists.txt', '.git'),
|
||||
},
|
||||
pyright = {
|
||||
settings = {
|
||||
python = {
|
||||
analysis = {
|
||||
autoSearchPaths = true,
|
||||
diagnosticMode = 'openFilesOnly',
|
||||
useLibraryCodeForTypes = true,
|
||||
typeCheckingMode = 'basic',
|
||||
},
|
||||
},
|
||||
positionEncoding = 'utf-8',
|
||||
},
|
||||
},
|
||||
nixd = {},
|
||||
ruff = {},
|
||||
texlab = {},
|
||||
cmake = {
|
||||
cmd = { 'cmake-language-server' },
|
||||
filetypes = { 'cmake' },
|
||||
root_dir = require('lspconfig.util').root_pattern('CMakeLists.txt', '.git'),
|
||||
},
|
||||
}
|
||||
|
||||
-- Iterate through the defined servers list and set them up with lspconfig
|
||||
for server_name, server_config_override in pairs(servers) do
|
||||
local server_ops = {
|
||||
capabilities = capabilities,
|
||||
}
|
||||
server_ops = vim.tbl_deep_extend('force', server_ops, server_config_override or {})
|
||||
local setup_ok, setup_err = pcall(require('lspconfig')[server_name].setup, server_ops)
|
||||
if not setup_ok then
|
||||
vim.notify("Error setting up LSP server '" .. server_name .. "': " .. tostring(setup_err), vim.log.levels.ERROR)
|
||||
else
|
||||
end
|
||||
end
|
||||
|
||||
-- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }),
|
||||
callback = function(event)
|
||||
local map = function(keys, func, desc, mode)
|
||||
mode = mode or 'n'
|
||||
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
||||
end
|
||||
|
||||
-- Standard LSP keymaps
|
||||
map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
|
||||
map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
|
||||
map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
||||
map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
||||
map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
|
||||
map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
|
||||
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
|
||||
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
|
||||
|
||||
-- Highlight references
|
||||
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||
local function client_supports_method(client, method, bufnr)
|
||||
if vim.fn.has 'nvim-0.11' == 1 then
|
||||
return client:supports_method(method, { bufnr = bufnr })
|
||||
else
|
||||
return client.supports_method(method, { bufnr = bufnr })
|
||||
end
|
||||
end
|
||||
if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
|
||||
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override', { clear = false })
|
||||
vim.api.nvim_create_autocmd(
|
||||
{ 'CursorHold', 'CursorHoldI' },
|
||||
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight }
|
||||
)
|
||||
vim.api.nvim_create_autocmd(
|
||||
{ 'CursorMoved', 'CursorMovedI' },
|
||||
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references }
|
||||
)
|
||||
vim.api.nvim_create_autocmd('LspDetach', {
|
||||
group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }),
|
||||
callback = function(event2)
|
||||
vim.lsp.buf.clear_references()
|
||||
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf }
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
-- Inlay hints toggle
|
||||
if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
|
||||
map('<leader>th', function()
|
||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
|
||||
end, '[T]oggle Inlay [H]ints')
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
-- Diagnostic configuration
|
||||
vim.diagnostic.config {
|
||||
severity_sort = true,
|
||||
float = { border = 'rounded', source = 'if_many' },
|
||||
underline = { severity = vim.diagnostic.severity.ERROR },
|
||||
signs = vim.g.have_nerd_font and {
|
||||
text = {
|
||||
[vim.diagnostic.severity.ERROR] = ' ',
|
||||
[vim.diagnostic.severity.WARN] = ' ',
|
||||
[vim.diagnostic.severity.INFO] = ' ',
|
||||
[vim.diagnostic.severity.HINT] = ' ',
|
||||
},
|
||||
} or {},
|
||||
virtual_text = {
|
||||
source = 'if_many',
|
||||
spacing = 2,
|
||||
format = function(diagnostic)
|
||||
local diagnostic_message = {
|
||||
[vim.diagnostic.severity.ERROR] = diagnostic.message,
|
||||
[vim.diagnostic.severity.WARN] = diagnostic.message,
|
||||
[vim.diagnostic.severity.INFO] = diagnostic.message,
|
||||
[vim.diagnostic.severity.HINT] = diagnostic.message,
|
||||
}
|
||||
return diagnostic_message[diagnostic.severity]
|
||||
end,
|
||||
},
|
||||
}
|
||||
end, -- End of config function
|
||||
},
|
||||
|
||||
-- lazydev setup (still useful for Neovim Lua development)
|
||||
{
|
||||
'folke/lazydev.nvim',
|
||||
ft = 'lua',
|
||||
opts = {
|
||||
library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } },
|
||||
},
|
||||
nixd = {},
|
||||
ruff = {},
|
||||
texlab = {},
|
||||
cmake = {
|
||||
cmd = { 'cmake-language-server' },
|
||||
filetypes = { 'cmake' },
|
||||
root_dir = require('lspconfig.util').root_pattern('CMakeLists.txt', '.git'),
|
||||
},
|
||||
}
|
||||
|
||||
for server_name, server in pairs(servers) do
|
||||
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
|
||||
require('lspconfig')[server_name].setup(server)
|
||||
end
|
||||
|
||||
require('custom.plugins.lsp.clangd').setup()
|
||||
|
||||
return {}
|
||||
|
|
|
|||
62
lua/custom/plugins/lsp/clangd.lua
Normal file
62
lua/custom/plugins/lsp/clangd.lua
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
local M = {}
|
||||
|
||||
local lspconfig = require 'lspconfig'
|
||||
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||
local Path = require 'plenary.path'
|
||||
local pickers = require 'telescope.pickers'
|
||||
local finders = require 'telescope.finders'
|
||||
local conf = require('telescope.config').values
|
||||
|
||||
local current_target = './build/debug'
|
||||
|
||||
local function make_clangd_cmd()
|
||||
return {
|
||||
'clangd',
|
||||
'--background-index',
|
||||
'--clang-tidy',
|
||||
'--header-insertion=never',
|
||||
'--query-driver=' .. vim.fn.exepath 'clang++',
|
||||
'--resource-dir=' .. vim.fn.trim(vim.fn.system 'clang++ --print-resource-dir',
|
||||
'--compile-commands-dir=' .. current_target,
|
||||
}
|
||||
end
|
||||
|
||||
local function reload_clangd()
|
||||
for _, client in pairs(vim.lsp.get_active_clients()) do
|
||||
if client.name == 'clangd' then
|
||||
client.stop()
|
||||
end
|
||||
end
|
||||
M.setup()
|
||||
end
|
||||
|
||||
function M.pick_target()
|
||||
pickers
|
||||
.new({}, {
|
||||
prompt_title = 'Choose build target',
|
||||
finder = finders.new_oneshot_job { 'fd', '-u', 'compile_commands.json', '-x', 'dirname', '{}' },
|
||||
sorter = conf.generic_sorter {},
|
||||
attach_mappings = function(_, map)
|
||||
map('i', '<CR>', function(prompt_bufnr)
|
||||
local entry = require('telescope.actions.state').get_selected_entry()
|
||||
current_target = entry[1]
|
||||
require('telescope.actions').close(prompt_bufnr)
|
||||
reload_clangd()
|
||||
end)
|
||||
return true
|
||||
end,
|
||||
})
|
||||
:find()
|
||||
end
|
||||
|
||||
function M.setup()
|
||||
lspconfig.clangd.setup {
|
||||
cmd = make_clangd_cmd(),
|
||||
filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' };
|
||||
root_dir = lspconfig.util.root_pattern('.git'),
|
||||
single_file_support = true,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -5,10 +5,10 @@ return {
|
|||
local statusline = require 'mini.statusline'
|
||||
|
||||
-- Add new section function
|
||||
statusline.section_target = function()
|
||||
local target = require('custom.utils'):get_target()
|
||||
return target and (' ' .. target) or ''
|
||||
end
|
||||
-- statusline.section_target = function()
|
||||
-- local target = require('custom.utils'):get_target()
|
||||
-- return target and (' ' .. target) or ''
|
||||
-- end
|
||||
|
||||
-- Override content.active to include target
|
||||
opts.content = opts.content or {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue