This commit is contained in:
hrsh7th
2022-01-10 23:01:47 +09:00
parent dff06958a7
commit 21456a109e
4 changed files with 12 additions and 11 deletions

View File

@@ -429,7 +429,7 @@ core.confirm = function(self, e, option, callback)
e:execute(vim.schedule_wrap(function() e:execute(vim.schedule_wrap(function()
release() release()
self.event:emit('confirm_done', { self.event:emit('confirm_done', {
entry = e entry = e,
}) })
if callback then if callback then
callback() callback()

View File

@@ -11,35 +11,36 @@ describe('types.lsp', function()
}) })
local vim_position, lsp_position local vim_position, lsp_position
vim_position = lsp.Position.to_vim('%', { line = 1, character = 3 }) local bufnr = vim.api.nvim_get_current_buf()
vim_position = lsp.Position.to_vim(bufnr, { line = 1, character = 3 })
assert.are.equal(vim_position.row, 2) assert.are.equal(vim_position.row, 2)
assert.are.equal(vim_position.col, 10) assert.are.equal(vim_position.col, 10)
lsp_position = lsp.Position.to_lsp('%', vim_position) lsp_position = lsp.Position.to_lsp(bufnr, vim_position)
assert.are.equal(lsp_position.line, 1) assert.are.equal(lsp_position.line, 1)
assert.are.equal(lsp_position.character, 3) assert.are.equal(lsp_position.character, 3)
vim_position = lsp.Position.to_vim('%', { line = 1, character = 0 }) vim_position = lsp.Position.to_vim(bufnr, { line = 1, character = 0 })
assert.are.equal(vim_position.row, 2) assert.are.equal(vim_position.row, 2)
assert.are.equal(vim_position.col, 1) assert.are.equal(vim_position.col, 1)
lsp_position = lsp.Position.to_lsp('%', vim_position) lsp_position = lsp.Position.to_lsp(bufnr, vim_position)
assert.are.equal(lsp_position.line, 1) assert.are.equal(lsp_position.line, 1)
assert.are.equal(lsp_position.character, 0) assert.are.equal(lsp_position.character, 0)
vim_position = lsp.Position.to_vim('%', { line = 1, character = 5 }) vim_position = lsp.Position.to_vim(bufnr, { line = 1, character = 5 })
assert.are.equal(vim_position.row, 2) assert.are.equal(vim_position.row, 2)
assert.are.equal(vim_position.col, 16) assert.are.equal(vim_position.col, 16)
lsp_position = lsp.Position.to_lsp('%', vim_position) lsp_position = lsp.Position.to_lsp(bufnr, vim_position)
assert.are.equal(lsp_position.line, 1) assert.are.equal(lsp_position.line, 1)
assert.are.equal(lsp_position.character, 5) assert.are.equal(lsp_position.character, 5)
-- overflow (lsp -> vim) -- overflow (lsp -> vim)
vim_position = lsp.Position.to_vim('%', { line = 1, character = 6 }) vim_position = lsp.Position.to_vim(bufnr, { line = 1, character = 6 })
assert.are.equal(vim_position.row, 2) assert.are.equal(vim_position.row, 2)
assert.are.equal(vim_position.col, 16) assert.are.equal(vim_position.col, 16)
-- overflow(vim -> lsp) -- overflow(vim -> lsp)
vim_position.col = vim_position.col + 1 vim_position.col = vim_position.col + 1
lsp_position = lsp.Position.to_lsp('%', vim_position) lsp_position = lsp.Position.to_lsp(bufnr, vim_position)
assert.are.equal(lsp_position.line, 1) assert.are.equal(lsp_position.line, 1)
assert.are.equal(lsp_position.character, 5) assert.are.equal(lsp_position.character, 5)
end) end)

View File

@@ -204,7 +204,7 @@ misc.redraw = setmetatable({
self.doing = false self.doing = false
self.force = false self.force = false
end) end)
end end,
}) })
return misc return misc

View File

@@ -112,7 +112,7 @@ view.open = function(self, ctx, sources)
-- complete_done. -- complete_done.
if #entries == 0 then if #entries == 0 then
self.event:emit('complete_done', { self.event:emit('complete_done', {
entry = self:_get_entries_view():get_selected_entry() entry = self:_get_entries_view():get_selected_entry(),
}) })
self:close() self:close()
end end