hexedtech/codemp-vscode
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-vscode.git synced 2024-11-22 07:24:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: try to send proper cursor range

Browse source
This commit is contained in:
əlemi 2023-07-09 03:42:08 +02:00
parent 6ef806285f
commit 75fdbfe48c
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
client/nvim/codemp.lua
View file

@ -7,7 +7,7 @@ M.create = function(path, content) return vim.rpcrequest(M.jobid, "create", pat
M.insert = function(path, txt, pos) return vim.rpcrequest(M.jobid, "insert", path, txt, pos) end M.insert = function(path, txt, pos) return vim.rpcrequest(M.jobid, "insert", path, txt, pos) end
M.delete = function(path, pos, count) return vim.rpcrequest(M.jobid, "delete", path, pos, count) end M.delete = function(path, pos, count) return vim.rpcrequest(M.jobid, "delete", path, pos, count) end
M.replace = function(path, txt) return vim.rpcrequest(M.jobid, "replace", path, txt) end M.replace = function(path, txt) return vim.rpcrequest(M.jobid, "replace", path, txt) end
M.cursor = function(path, row, col) return vim.rpcrequest(M.jobid, "cursor", path, row, col) end M.cursor = function(path, cur) return vim.rpcrequest(M.jobid, "cursor", path, cur[1][1], cur[1][2], cur[2][1], cur[2][2]) end
M.attach = function(path) return vim.rpcrequest(M.jobid, "attach", path) end M.attach = function(path) return vim.rpcrequest(M.jobid, "attach", path) end
M.listen = function(path) return vim.rpcrequest(M.jobid, "listen", path) end M.listen = function(path) return vim.rpcrequest(M.jobid, "listen", path) end
M.detach = function(path) return vim.rpcrequest(M.jobid, "detach", path) end M.detach = function(path) return vim.rpcrequest(M.jobid, "detach", path) end
@ -19,6 +19,24 @@ end
local codemp_autocmds = vim.api.nvim_create_augroup("CodempAuGroup", { clear = true }) local codemp_autocmds = vim.api.nvim_create_augroup("CodempAuGroup", { clear = true })
local function get_cursor_range()
local mode = vim.fn.mode()
if mode == "" or mode == "s" or mode == "Vs" or mode == "V" or mode == "vs" or mode == "v" then
local start = vim.fn.getpos("'<")
local finish = vim.fn.getpos("'>")
return {
{ start[2], start[3] },
{ finish[2], finish[3] }
}
else
local cursor = vim.api.nvim_win_get_cursor(0)
return {
{ cursor[1], cursor[2] },
{ cursor[1], cursor[2] + 1 },
}
end
end
local function hook_callbacks(path, buffer) local function hook_callbacks(path, buffer)
vim.api.nvim_create_autocmd( vim.api.nvim_create_autocmd(
{ "InsertCharPre" }, { "InsertCharPre" },
@ -36,8 +54,7 @@ local function hook_callbacks(path, buffer)
callback = function(args) callback = function(args)
local lines = vim.api.nvim_buf_get_lines(args.buf, 0, -1, false) local lines = vim.api.nvim_buf_get_lines(args.buf, 0, -1, false)
pcall(M.replace, path, vim.fn.join(lines, "\n")) -- TODO log errors pcall(M.replace, path, vim.fn.join(lines, "\n")) -- TODO log errors
local cursor = vim.api.nvim_win_get_cursor(0) pcall(M.cursor, path, get_cursor_range()) -- TODO log errors
pcall(M.cursor, path, cursor[1], cursor[2]) -- TODO log errors
end, end,
buffer = buffer, buffer = buffer,
group = codemp_autocmds, group = codemp_autocmds,
@ -48,12 +65,12 @@ local function hook_callbacks(path, buffer)
{ "CursorMovedI" }, { "CursorMovedI" },
{ {
callback = function(args) callback = function(args)
local cursor = vim.api.nvim_win_get_cursor(0) local cursor = get_cursor_range()
pcall(M.cursor, path, cursor[1], cursor[2]) -- TODO log errors pcall(M.cursor, path, cursor) -- TODO log errors
if cursor[1] == last_line then if cursor[1][1] == last_line then
return return
end end
last_line = cursor[1] last_line = cursor[1][1]
local lines = vim.api.nvim_buf_get_lines(args.buf, 0, -1, false) local lines = vim.api.nvim_buf_get_lines(args.buf, 0, -1, false)
pcall(M.replace, path, vim.fn.join(lines, "\n")) -- TODO log errors pcall(M.replace, path, vim.fn.join(lines, "\n")) -- TODO log errors
end, end,