[Bug] layout selection is not persistent when using JJ adapter

[jakubbortlik]

Description

Hi David,
When I'm using the JJ adapter, and do something like DiffviewOpen main, and I change the layout with g<C-x>, the layout reverts back to the default when I switch tabs.

Expected behavior

Layout should be persistent when switching tabs.

Actual behavior

Layout reverts to the default when switching tabs.

Steps to reproduce

1. nvim --clean -u mini.lua
2. :DiffviewOpen main on a branch
3. g<C-x> to switch layout
4. gtgt to switch tabs

Health check

Output of :checkhealth diffview

diffview:                                                                 2 ⚠️

Checking plugin dependencies
- ✅ OK nvim-web-devicons installed.
- ⚠️ WARNING Optional dependency 'mini.icons' not found.

Checking VCS tools
- The plugin requires at least one of the supported VCS tools to be valid.
- ✅ OK Jujutsu found.
- ✅ OK Jujutsu is up-to-date. (0.44.0)
- ✅ OK Git found.
- ✅ OK Git is up-to-date. (2.55.0)
- ✅ OK Mercurial found.
- ✅ OK Mercurial is up-to-date. (7.2.4)
- ⚠️ WARNING Configured p4_cmd is not executable: 'p4'

Log info

Relevant info from :DiffviewLog

############################
### PUT LOG CONTENT HERE ###
############################

Neovim version

NVIM v0.12.5
Build type: Release
LuaJIT 2.1.1774638290

Operating system and version

Linux 7.1.10-1-MANJARO x86_64 GNU/Linux

Minimal config

local root = vim.fn.stdpath("run") .. "/nvim/diffview-plus.nvim"
local plugin_dir = root .. "/plugins"
vim.fn.mkdir(plugin_dir, "p")

for _, name in ipairs({ "config", "data", "state", "cache" }) do
  vim.env[("XDG_%s_HOME"):format(name:upper())] = root .. "/" .. name
end

local plugins = {
  { "nvim-web-devicons", url = "https://github.com/nvim-tree/nvim-web-devicons.git" },
  { "diffview-plus.nvim", url = "https://github.com/dlyongemallo/diffview-plus.nvim.git" },
}

for _, spec in ipairs(plugins) do
  local install_path = plugin_dir .. "/" .. spec[1]
  if vim.fn.isdirectory(install_path) ~= 1 then
    if spec.url then
      print(string.format("Installing '%s'...", spec[1]))
      vim.fn.system({ "git", "clone", "--depth=1", spec.url, install_path })
    end
  end
  vim.opt.runtimepath:append(spec.path or install_path)
end

require("diffview").setup({
  preferred_adapter = "jj",  -- THIS IS THE LINE REQUIRED FOR REPRODUCTION
})

vim.opt.termguicolors = true
vim.cmd("colorscheme habamax")

print("Ready!")

[dlyongemallo]

@jakubbortlik Let me know if this is still an issue.

[jakubbortlik]

Hi @dlyongemallo, thanks for the fix! The layout persistence is not an issue anymore. There is still one difference from the Git adapter in that with the JJ adapter when switching tabs from and to the Diffview, the buffers flicker from "diffview://null" to the actual buffer content. This is probably required by the JJ adapter to make it work correctly, it's just surprising that the Git adapter doesn't require such re-creation (and the resulting flicker).

[dlyongemallo]

@jakubbortlik Can you give #320 a try?