GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): support v:count in selection_range() #34551

Browse Source 
Co-authored-by: Yi Ming <ofseed@foxmail.com>
This commit is contained in:
Riley Bruins
2025-06-17 14:10:57 -07:00
committed by GitHub
parent b3c78f4b3c
commit 17c18efbe5
5 changed files with 140 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/lsp.txt
View File

@ -1839,11 +1839,11 @@ rename({new_name}, {opts}) *vim.lsp.buf.rename()*
selection_range({direction}) *vim.lsp.buf.selection_range()*
Perform an incremental selection at the cursor position based on ranges
given by the LSP. The `direction` parameter specifies whether the
selection should head inward or outward.
given by the LSP. The `direction` parameter specifies the number of times
to expand the selection. Negative values will shrink the selection.
Parameters: ~
• {direction} (`'inner'|'outer'`)
• {direction} (`integer`)
signature_help({config}) *vim.lsp.buf.signature_help()*
Displays signature information about the symbol under the cursor in a

3
runtime/doc/news.txt
View File

@ -24,7 +24,8 @@ EXPERIMENTS
LSP
• todo
• |vim.lsp.buf.selection_range()| now accepts an integer which specifies its
direction, rather than a string `'outer'` or `'inner'`.
OPTIONS

8
runtime/lua/vim/_defaults.lua
View File

@ -210,12 +210,12 @@ do
end, { desc = 'vim.lsp.buf.implementation()' })
vim.keymap.set('x', 'an', function()
vim.lsp.buf.selection_range('outer')
end, { desc = "vim.lsp.buf.selection_range('outer')" })
vim.lsp.buf.selection_range(vim.v.count1)
end, { desc = 'vim.lsp.buf.selection_range(vim.v.count1)' })
vim.keymap.set('x', 'in', function()
vim.lsp.buf.selection_range('inner')
end, { desc = "vim.lsp.buf.selection_range('inner')" })
vim.lsp.buf.selection_range(-vim.v.count1)
end, { desc = 'vim.lsp.buf.selection_range(-vim.v.count1)' })
vim.keymap.set('n', 'gO', function()
vim.lsp.buf.document_symbol()

21
runtime/lua/vim/lsp/buf.lua
View File

@ -1413,20 +1413,16 @@ local function is_empty(range)
end
--- Perform an incremental selection at the cursor position based on ranges given by the LSP. The
--- `direction` parameter specifies whether the selection should head inward or outward.
--- `direction` parameter specifies the number of times to expand the selection. Negative values
--- will shrink the selection.
---
--- @param direction 'inner' | 'outer'
--- @param direction integer
function M.selection_range(direction)
validate('direction', direction, function(v)
return v == 'inner' or v == 'outer'
end)
validate('direction', direction, 'number')
if selection_ranges then
local offset = direction == 'outer' and 1 or -1
local new_index = selection_ranges.index + offset
if new_index <= #selection_ranges.ranges and new_index >= 1 then
selection_ranges.index = new_index
end
local new_index = selection_ranges.index + direction
selection_ranges.index = math.min(#selection_ranges.ranges, math.max(1, new_index))
select_range(selection_ranges.ranges[selection_ranges.index])
return
@ -1498,8 +1494,9 @@ function M.selection_range(direction)
})
if #ranges > 0 then
selection_ranges = { index = 1, ranges = ranges }
select_range(ranges[1])
local index = math.min(#ranges, math.max(1, direction))
selection_ranges = { index = index, ranges = ranges }
select_range(ranges[index])
end
end
)

122
test/functional/plugin/lsp/selection_range_spec.lua Normal file
View File

@ -0,0 +1,122 @@
local t = require('test.testutil')
local n = require('test.functional.testnvim')()
local t_lsp = require('test.functional.plugin.lsp.testutil')
local Screen = require('test.functional.ui.screen')
local dedent = t.dedent
local exec_lua = n.exec_lua
local insert = n.insert
local clear_notrace = t_lsp.clear_notrace
local create_server_definition = t_lsp.create_server_definition
describe('vim.lsp.selection_range', function()
local text = dedent([[
hello
hello
hello
hello
hello]])
--- @type test.functional.ui.screen
local screen
before_each(function()
clear_notrace()
screen = Screen.new(50, 9)
exec_lua(create_server_definition)
exec_lua(function()
_G.server = _G._create_server({
capabilities = {
selectionRangeProvider = true,
},
handlers = {
['textDocument/selectionRange'] = function(_, _, callback)
callback(nil, {
{
range = {
start = { line = 2, character = 0 },
['end'] = { line = 2, character = 5 },
},
parent = {
range = {
start = { line = 1, character = 0 },
['end'] = { line = 3, character = 5 },
},
parent = {
range = {
start = { line = 0, character = 0 },
['end'] = { line = 5, character = 5 },
},
parent = nil,
},
},
},
})
end,
},
})
return vim.lsp.start({ name = 'dummy', cmd = _G.server.cmd })
end)
insert(text)
end)
it('selects ranges', function()
-- Initial range
exec_lua(function()
local win = vim.api.nvim_get_current_win()
vim.api.nvim_win_set_cursor(win, { 3, 0 })
vim.lsp.buf.selection_range(1)
end)
screen:expect([[
hello |*2
{17:hell}^o |
hello |*2
{1:~ }|*3
{5:-- VISUAL --} |
]])
-- Outermost range
exec_lua(function()
vim.lsp.buf.selection_range(99)
end)
screen:expect([[
{17:hello} |*4
{17:hell}^o |
{1:~ }|*3
{5:-- VISUAL --} |
]])
-- Back to innermost
exec_lua(function()
vim.lsp.buf.selection_range(-99)
end)
screen:expect([[
hello |*2
{17:hell}^o |
hello |*2
{1:~ }|*3
{5:-- VISUAL --} |
]])
-- Middle range
exec_lua(function()
vim.lsp.buf.selection_range(1)
end)
screen:expect([[
hello |
{17:hello} |*2
{17:hell}^o |
hello |
{1:~ }|*3
{5:-- VISUAL --} |
]])
end)
end)