Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(splits): leverage winlayout #375

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
+273 −663
Draft

feat(splits): leverage winlayout #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a8ebc8
feat(splits): leverage winlayout
shortcuts Jun 29, 2024
8029fb5
chore: add new state helpers
shortcuts Jun 29, 2024
cc133c9
fix: closing sides
shortcuts Jun 29, 2024
375a5bc
fix: integrations
shortcuts Jun 29, 2024
7e4e767
fix: more tests
shortcuts Jun 29, 2024
e930d3d
fix: flaky test
shortcuts Jun 30, 2024
b1af8e4
fix: mappings
shortcuts Jun 30, 2024
357c781
fix: wrong integration test
shortcuts Jun 30, 2024
776caec
chore: tests, getting there
shortcuts Jun 30, 2024
4194778
fix: unused skips
shortcuts Jun 30, 2024
6d74bb4
fix: inconsistent walking
shortcuts Jul 2, 2024
6a1e0d9
chore: descriptions
shortcuts Jul 2, 2024
3bd5ab2
chore: this is huge
shortcuts Jul 3, 2024
ef776d9
chore: less refresh
shortcuts Jul 3, 2024
5a04153
fix: splits
shortcuts Jul 3, 2024
14c86a7
chore: layout and side checking stuffs
shortcuts Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ $(addprefix test-, $(TESTFILES)): test-%:
-c "lua MiniTest.run_file('tests/test_$*.lua', { execute = { reporter = MiniTest.gen_reporter.stdout({ group_depth = 2 }) } })"
deps:
./scripts/clone_deps.sh 1 || true
# bc for mini.nvim before this date
./scripts/reset_deps_at_date.sh ./deps/mini.nvim

deps-latest:
./scripts/clone_deps.sh 1 || true
deps-lint:
luarocks install argparse --force
luarocks install luafilesystem --force
luarocks install lanes --force
luarocks install luacheck --force

test-ci: deps test

Expand All @@ -39,6 +40,7 @@ documentation-ci: deps documentation

lint:
stylua . -g '*.lua' -g '!deps/' -g '!nightly/'
luacheck plugin/ lua/

luals-ci:
rm -rf .ci/lua-ls/log
Expand Down
197 changes: 39 additions & 158 deletions lua/no-neck-pain/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ function N.toggleSide(scope, side)
return N.disable(scope)
end

S.scanLayout(S, scope)

N.init(scope)
end

Expand Down Expand Up @@ -109,6 +111,8 @@ function N.init(scope, goToCurr, skipIntegrations)
or (not hadSideBuffers and S.checkSides(S, "or", true))
or (S.isSideTheActiveWin(S, "left") or S.isSideTheActiveWin(S, "right"))
then
D.log(scope, "re-routing focus to curr")

vim.fn.win_gotoid(S.getSideID(S, "curr"))
end

Expand All @@ -126,18 +130,16 @@ function N.enable(scope)

D.log(scope, "calling enable for tab %d", A.getCurrentTab())

S.setEnabled(S)
S.setTab(S, A.getCurrentTab())

local augroupName = A.getAugroupName(S.activeTab)
vim.api.nvim_create_augroup(augroupName, { clear = true })

S.setSideID(S, vim.api.nvim_get_current_win(), "curr")
S.computeSplits(S, S.getSideID(S, "curr"))

S.scanLayout(S, scope)
N.init(scope, true)

S.setEnabled(S)

vim.api.nvim_create_autocmd({ "VimResized" }, {
callback = function(p)
vim.schedule(function()
Expand All @@ -163,9 +165,7 @@ function N.enable(scope)
vim.api.nvim_create_autocmd({ "TabLeave" }, {
callback = function(p)
vim.schedule(function()
if
S.isActiveTabRegistered(S) and not vim.api.nvim_tabpage_is_valid(S.activeTab)
then
if not vim.api.nvim_tabpage_is_valid(S.activeTab) then
S.refreshTabs(S, S.activeTab)
D.log(p.event, "tab %d is now inactive", S.activeTab)
else
Expand All @@ -189,194 +189,75 @@ function N.enable(scope)
desc = "Keeps track of the currently active tab",
})

vim.api.nvim_create_autocmd({ "WinEnter" }, {
callback = function(p)
vim.schedule(function()
p.event = string.format("%s:split", p.event)
if not S.isActiveTabRegistered(S) or E.skip(S.getTab(S)) then
return D.log(p.event, "skip")
end

if S.checkSides(S, "and", false) then
return D.log(p.event, "no side buffer")
end

if S.isSideTheActiveWin(S, "curr") then
return D.log(p.event, "current win")
end

-- an integration isn't considered as a split
local isSupportedIntegration = S.isSupportedIntegration(S, p.event, nil)
if isSupportedIntegration then
return D.log(p.event, "on an integration")
end

local wins = S.getUnregisteredWins(S)

if #wins ~= 1 then
return D.log(p.event, "no new or too many unregistered windows")
end

local focusedWin = wins[1]

local isVSplit = S.computeSplits(S, focusedWin)
S.setSplit(S, { id = focusedWin, vertical = isVSplit })

if isVSplit then
N.init(p.event)
end
end)
end,
group = augroupName,
desc = "WinEnter covers the split/vsplit management",
})

vim.api.nvim_create_autocmd({ "QuitPre", "BufDelete" }, {
callback = function(p)
vim.schedule(function()
local s = string.format("%s:quit", p.event)
if
not S.isActiveTabRegistered(S)
or E.skip(nil)
or not S.isActiveTabRegistered(S)
then
return
end

if S.hasSplits(S) then
return D.log(s, "splits still active")
end

if
(
(S.isSideRegistered(S, "left") and not S.isSideWinValid(S, "left"))
or (S.isSideRegistered(S, "right") and not S.isSideWinValid(S, "right"))
)
or (
p.event == "BufDelete"
and not _G.NoNeckPain.config.fallbackOnBufferDelete
and not S.isSideWinValid(S, "curr")
)
then
D.log(s, "one of the NNP side has been closed")

return N.disable(s)
end

if S.isSideWinValid(S, "curr") then
D.log(s, "curr is still valid, skipping")

if not S.isActiveTabRegistered(S) or E.skip(nil) then
return
end

-- if we still have a side valid but curr has been deleted (mostly because of a :bd),
-- we will fallback to the first valid side
if p.event == "QuitPre" then
D.log(s, "curr has been closed")
S.scanLayout(S, p.event)

return N.disable(s)
end
if not vim.api.nvim_win_is_valid(S.getSideID(S, "curr")) then
if p.event == "BufDelete" and _G.NoNeckPain.config.fallbackOnBufferDelete then
D.log(p.event, "`curr` has been deleted, resetting state")

D.log(s, "`curr` has been deleted, resetting state")
vim.cmd("new")

vim.cmd("new")
N.disable(string.format("%s:reset", p.event))
N.enable(string.format("%s:reset", p.event))

N.disable(string.format("%s:reset", s))
N.enable(string.format("%s:reset", s))
end)
end,
group = augroupName,
desc = "Handles the closure of main NNP windows",
})
return
end

vim.api.nvim_create_autocmd({ "WinClosed", "BufDelete" }, {
callback = function(p)
vim.schedule(function()
if
not S.isActiveTabRegistered(S)
or E.skip(nil)
or not S.hasSplits(S)
or W.stateWinsActive(true)
then
return
end
local wins = S.getUnregisteredWins(S)
if #wins == 0 then
D.log(p.event, "no active windows found")

S.tabs[S.activeTab].wins.splits = vim.tbl_filter(function(split)
if vim.api.nvim_win_is_valid(split.id) then
return true
return N.disable(p.event)
end

S.decreaseLayers(S, split.vertical)
S.setSideID(S, wins[1], "curr")

return false
end, S.tabs[S.activeTab].wins.splits)
D.log(p.event, "re-routing to %d", S.getSideID(S, "curr"))

if #S.tabs[S.activeTab].wins.splits == 0 then
S.initSplits(S)
return N.init(p.event, true)
end

-- we keep track if curr have been closed because if it's the case,
-- the focus will be on a side buffer which is wrong
local haveCloseCurr = false

-- if curr is not valid anymore, we focus the first valid split and remove it from the state
if not vim.api.nvim_win_is_valid(S.getSideID(S, "curr")) then
-- if neither curr and splits are remaining valids, we just disable
if not S.hasSplits(S) then
return N.disable(p.event)
end

haveCloseCurr = true

local split = S.tabs[S.activeTab].wins.splits[1]
if
(S.isSideWinValid(S, "left") and not S.isSideWinValid(S, "left"))
or (S.isSideWinValid(S, "right") and not S.isSideWinValid(S, "right"))
then
D.log(p.event, "one of the NNP side has been closed")

S.decreaseLayers(S, split.vertical)
S.setSideID(S, split.id, "curr")
S.removeSplit(S, split.id)
return N.disable(p.event)
end

-- we only restore focus on curr if there's no split left
N.init(p.event, haveCloseCurr or not S.hasSplits(S))
-- return N.init(p.event)
end)
end,
group = augroupName,
desc = "Aims at restoring NNP enable state after closing a split/vsplit buffer or a main buffer",
desc = "keeps track of the state after closing windows and deleting buffers",
})

vim.api.nvim_create_autocmd({ "WinEnter", "WinClosed" }, {
callback = function(p)
vim.schedule(function()
local s = string.format("%s:integration", p.event)
if
not S.isActiveTabRegistered(S)
or not S.isActiveTabRegistered(S)
or E.skip(S.getTab(S))
then
return D.log(s, "skip")
if not S.isActiveTabRegistered(S) or E.skip(S.getTab(S)) then
return D.log(p.event, "skip")
end

S.scanLayout(S, p.event)

if S.wantsSides(S) and S.checkSides(S, "and", false) then
return D.log(s, "no side buffer")
return D.log(p.event, "no side buffer")
end

if p.event == "WinClosed" and not S.hasIntegrations(S) then
return D.log(s, "no registered integration")
end

local unregistered = S.getUnregisteredWins(S)
if p.event == "WinEnter" and #unregistered == 0 then
return D.log(s, "no new windows")
end

if
p.event == "WinEnter"
and #unregistered == 1
and not S.isSupportedIntegration(S, s, unregistered[1])
then
return D.log(s, "encountered a new window, not an integration")
return D.log(p.event, "no registered integration")
end

N.init(s, false, true)
N.init(p.event, false, true)
end)
end,
group = augroupName,
Expand Down
Loading
Loading