From 21456a109e82c4f9389e93c9eed1d90af16b9a0c Mon Sep 17 00:00:00 2001 From: hrsh7th Date: Mon, 10 Jan 2022 23:01:47 +0900 Subject: [PATCH] fmt/test --- lua/cmp/core.lua | 2 +- lua/cmp/types/lsp_spec.lua | 17 +++++++++-------- lua/cmp/utils/misc.lua | 2 +- lua/cmp/view.lua | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lua/cmp/core.lua b/lua/cmp/core.lua index 2983092..0964e32 100644 --- a/lua/cmp/core.lua +++ b/lua/cmp/core.lua @@ -429,7 +429,7 @@ core.confirm = function(self, e, option, callback) e:execute(vim.schedule_wrap(function() release() self.event:emit('confirm_done', { - entry = e + entry = e, }) if callback then callback() diff --git a/lua/cmp/types/lsp_spec.lua b/lua/cmp/types/lsp_spec.lua index 81d9121..fc2b857 100644 --- a/lua/cmp/types/lsp_spec.lua +++ b/lua/cmp/types/lsp_spec.lua @@ -11,35 +11,36 @@ describe('types.lsp', function() }) 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.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.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.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.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.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.character, 5) -- 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.col, 16) -- overflow(vim -> lsp) 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.character, 5) end) diff --git a/lua/cmp/utils/misc.lua b/lua/cmp/utils/misc.lua index 23264d3..80aa287 100644 --- a/lua/cmp/utils/misc.lua +++ b/lua/cmp/utils/misc.lua @@ -204,7 +204,7 @@ misc.redraw = setmetatable({ self.doing = false self.force = false end) - end + end, }) return misc diff --git a/lua/cmp/view.lua b/lua/cmp/view.lua index a786cce..454e2ea 100644 --- a/lua/cmp/view.lua +++ b/lua/cmp/view.lua @@ -112,7 +112,7 @@ view.open = function(self, ctx, sources) -- complete_done. if #entries == 0 then self.event:emit('complete_done', { - entry = self:_get_entries_view():get_selected_entry() + entry = self:_get_entries_view():get_selected_entry(), }) self:close() end