Compare commits
2 commits
7eeae5d325
...
b8742d6226
Author | SHA1 | Date | |
---|---|---|---|
b8742d6226 | |||
3cb529be0b |
2 changed files with 22 additions and 2 deletions
|
@ -14,6 +14,17 @@ local function toggle_win_opt(name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function toggle_current_win_diagnostic()
|
||||||
|
local d = vim.diagnostic
|
||||||
|
if d.is_disabled(0, nil) then
|
||||||
|
d.enable(0, nil)
|
||||||
|
vim.notify('Enabling diagnostic')
|
||||||
|
else
|
||||||
|
d.disable(0, nil)
|
||||||
|
vim.notify('Disabling diagnostic')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function M.setup()
|
function M.setup()
|
||||||
vim.keymap.set('n', '<S-Down>', '<C-E>')
|
vim.keymap.set('n', '<S-Down>', '<C-E>')
|
||||||
vim.keymap.set('n', '<S-Up>', '<C-Y>')
|
vim.keymap.set('n', '<S-Up>', '<C-Y>')
|
||||||
|
@ -34,6 +45,7 @@ function M.setup()
|
||||||
vim.keymap.set('n', '<leader>on', function() toggle_win_opt('number') end, { desc = 'Toggle number' })
|
vim.keymap.set('n', '<leader>on', function() toggle_win_opt('number') end, { desc = 'Toggle number' })
|
||||||
vim.keymap.set('n', '<leader>or', function() toggle_win_opt('relativenumber') end, { desc = 'Toggle relativenumber' })
|
vim.keymap.set('n', '<leader>or', function() toggle_win_opt('relativenumber') end, { desc = 'Toggle relativenumber' })
|
||||||
vim.keymap.set('n', '<leader>oR', require('configs.options').setup, { desc = 'RESET' })
|
vim.keymap.set('n', '<leader>oR', require('configs.options').setup, { desc = 'RESET' })
|
||||||
|
vim.keymap.set('n', '<leader>od', toggle_current_win_diagnostic, { desc = 'Toggle diagnostic' })
|
||||||
vim.keymap.set('n', '<leader>of', function()
|
vim.keymap.set('n', '<leader>of', function()
|
||||||
if (vim.api.nvim_win_get_option(0, 'foldmethod') ~= 'marker') then
|
if (vim.api.nvim_win_get_option(0, 'foldmethod') ~= 'marker') then
|
||||||
vim.api.nvim_win_set_option(0, 'foldmethod', 'marker')
|
vim.api.nvim_win_set_option(0, 'foldmethod', 'marker')
|
||||||
|
|
|
@ -129,7 +129,7 @@ end
|
||||||
|
|
||||||
local function update_attached(bufnr)
|
local function update_attached(bufnr)
|
||||||
local attached = '';
|
local attached = '';
|
||||||
for _, client in pairs(vim.lsp.get_active_clients({ bufnr = bufnr })) do
|
for _, client in pairs(vim.lsp.get_clients({ bufnr = bufnr })) do
|
||||||
attached = attached .. ',' .. client.name
|
attached = attached .. ',' .. client.name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -141,6 +141,10 @@ local function on_attach(args) -- {{{
|
||||||
|
|
||||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||||
|
|
||||||
|
if client == nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
if (client.server_capabilities.documentSymbolProvider) then
|
if (client.server_capabilities.documentSymbolProvider) then
|
||||||
navic_attach(client, bufnr)
|
navic_attach(client, bufnr)
|
||||||
end
|
end
|
||||||
|
@ -176,11 +180,14 @@ local function on_attach(args) -- {{{
|
||||||
-- (note, if the height of the float would be greater than the space left above the cursor, it will default
|
-- (note, if the height of the float would be greater than the space left above the cursor, it will default
|
||||||
-- to placing the float below the cursor. The max_height option allows for finer tuning of this)
|
-- to placing the float below the cursor. The max_height option allows for finer tuning of this)
|
||||||
},
|
},
|
||||||
|
display_automatically = true,
|
||||||
|
silent = true,
|
||||||
keymaps = {
|
keymaps = {
|
||||||
next_signature = '<C-j>',
|
next_signature = '<C-j>',
|
||||||
previous_signature = '<C-k>',
|
previous_signature = '<C-k>',
|
||||||
next_parameter = '<C-l>',
|
next_parameter = '<C-l>',
|
||||||
previous_parameter = '<C-h>',
|
previous_parameter = '<C-h>',
|
||||||
|
close_signature = '',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -215,7 +222,7 @@ local function on_attach(args) -- {{{
|
||||||
)
|
)
|
||||||
|
|
||||||
if (formatting_filter(client)) then
|
if (formatting_filter(client)) then
|
||||||
vim.api.nvim_buf_set_option(bufnr, 'formatexpr', 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})')
|
vim.api.nvim_set_option_value('formatexpr', 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})', {buf= bufnr})
|
||||||
end
|
end
|
||||||
|
|
||||||
if client.name == 'omnisharp' then
|
if client.name == 'omnisharp' then
|
||||||
|
@ -385,6 +392,7 @@ return {
|
||||||
{ 'Issafalcon/lsp-overloads.nvim', lazy = true },
|
{ 'Issafalcon/lsp-overloads.nvim', lazy = true },
|
||||||
{
|
{
|
||||||
'someone-stole-my-name/yaml-companion.nvim',
|
'someone-stole-my-name/yaml-companion.nvim',
|
||||||
|
lazy = true,
|
||||||
dependencies = {
|
dependencies = {
|
||||||
{ 'neovim/nvim-lspconfig' },
|
{ 'neovim/nvim-lspconfig' },
|
||||||
{ 'nvim-lua/plenary.nvim' },
|
{ 'nvim-lua/plenary.nvim' },
|
||||||
|
|
Loading…
Add table
Reference in a new issue