mirror of
https://github.com/hexedtech/codemp-nvim.git
synced 2024-11-25 08:54:50 +01:00
feat: ask what to do when out of sync
This commit is contained in:
parent
44b0e05e98
commit
a001a96abf
1 changed files with 33 additions and 19 deletions
|
@ -8,6 +8,21 @@ local buffer_id_map = {}
|
||||||
local user_buffer_name = {}
|
local user_buffer_name = {}
|
||||||
local ticks = {}
|
local ticks = {}
|
||||||
|
|
||||||
|
---@param name string
|
||||||
|
--TODO this should happen at the level above (Workspace) but accesses tables on this level, badly designed!
|
||||||
|
local function detach(name)
|
||||||
|
local buffer = buffer_id_map[name]
|
||||||
|
id_buffer_map[buffer] = nil
|
||||||
|
buffer_id_map[name] = nil
|
||||||
|
if not CODEMP.workspace:detach(name) then
|
||||||
|
collectgarbage("collect") -- clear dangling references
|
||||||
|
end
|
||||||
|
|
||||||
|
print(" -- detached from buffer " .. name)
|
||||||
|
|
||||||
|
require('codemp.window').update()
|
||||||
|
end
|
||||||
|
|
||||||
---@class AttachOptions
|
---@class AttachOptions
|
||||||
---@field content? string if provided, set this as content after attaching
|
---@field content? string if provided, set this as content after attaching
|
||||||
---@field nowait? boolean skip waiting for initial content sync
|
---@field nowait? boolean skip waiting for initial content sync
|
||||||
|
@ -127,10 +142,24 @@ local function attach(name, opts)
|
||||||
utils.buffer.set_content(buffer, event.content, event.start, event.finish)
|
utils.buffer.set_content(buffer, event.content, event.start, event.finish)
|
||||||
if event.hash ~= nil then
|
if event.hash ~= nil then
|
||||||
if CODEMP.native.hash(utils.buffer.get_content(buffer)) ~= event.hash then
|
if CODEMP.native.hash(utils.buffer.get_content(buffer)) ~= event.hash then
|
||||||
-- OUT OF SYNC!
|
if CODEMP.config.auto_sync then
|
||||||
-- TODO this may be destructive! we should probably prompt the user before doing this
|
print(" /!\\ out of sync, resynching...")
|
||||||
print(" /!\\ out of sync, resynching...")
|
utils.buffer.set_content(buffer, controller:content():await())
|
||||||
utils.buffer.set_content(buffer, controller:content():await())
|
else
|
||||||
|
vim.ui.select(
|
||||||
|
{ "sync", "detach" },
|
||||||
|
{ prompt = "out of sync! force resync or detach?" },
|
||||||
|
function (choice)
|
||||||
|
if not choice then return end
|
||||||
|
if choice == "sync" then
|
||||||
|
utils.buffer.set_content(buffer, controller:content():await())
|
||||||
|
end
|
||||||
|
if choice == "detach" then
|
||||||
|
detach(name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
)
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -162,21 +191,6 @@ local function attach(name, opts)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param name string
|
|
||||||
--TODO this should happen at the level above (Workspace) but accesses tables on this level, badly designed!
|
|
||||||
local function detach(name)
|
|
||||||
local buffer = buffer_id_map[name]
|
|
||||||
id_buffer_map[buffer] = nil
|
|
||||||
buffer_id_map[name] = nil
|
|
||||||
if not CODEMP.workspace:detach(name) then
|
|
||||||
collectgarbage("collect") -- clear dangling references
|
|
||||||
end
|
|
||||||
|
|
||||||
print(" -- detached from buffer " .. name)
|
|
||||||
|
|
||||||
require('codemp.window').update()
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param buffer? integer if provided, sync given buffer id, otherwise sync current buf
|
---@param buffer? integer if provided, sync given buffer id, otherwise sync current buf
|
||||||
local function sync(buffer)
|
local function sync(buffer)
|
||||||
if buffer == nil then
|
if buffer == nil then
|
||||||
|
|
Loading…
Reference in a new issue