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

Limit the amount of horizontal splits you can do #4642

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Limit the amount of horizontal splits you can do #4642

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f8b743
hsplit and hsplit_new in commands/typed.rs now search for views with …
janhrastnik Nov 7, 2022
b3e1741
added proposed changes to the if statements in hsplit and hsplit_new
janhrastnik Nov 8, 2022
d1ff90d
added limit for horizontal splits that are called via key in window mode
janhrastnik Nov 9, 2022
dda4607
seperated horizontal split limit check into a function
janhrastnik Nov 9, 2022
315b9e6
Merge branch 'helix-editor:master' into hsplit_limit
janhrastnik Nov 9, 2022
9032a3a
hsplit_limit_check now checks if the view with a height of 1 is a chi…
janhrastnik Nov 13, 2022
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
33 changes: 33 additions & 0 deletions helix-term/src/commands/typed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ fn hsplit(
}

let id = view!(cx.editor).doc;
let view_id = view!(cx.editor).id;

if args.is_empty() {
cx.editor.switch(id, Action::HorizontalSplit);
Expand All @@ -1162,6 +1163,21 @@ fn hsplit(
}
}

// check if there are views with height equal to 1
// if there are, close the newly created view
if cx
.editor
.tree
.views()
.any(|(view, _focused)| view.area.height == 1)
{
cx.editor.set_error("Max number of splits reached");
cx.editor.close(view!(cx.editor).id);

// focus the view from which the split was called
cx.editor.focus(view_id);
}

Ok(())
}

Expand All @@ -1188,8 +1204,25 @@ fn hsplit_new(
return Ok(());
}

let view_id = view!(cx.editor).id;

cx.editor.new_file(Action::HorizontalSplit);

// check if there are views with height equal to 1
// if there are, close the newly created view
if cx
.editor
.tree
.views()
.any(|(view, _focused)| view.area.height == 1)
{
cx.editor.set_error("Max number of splits reached");
cx.editor.close(view!(cx.editor).id);

// focus the view from which the split was called
cx.editor.focus(view_id);
}

Ok(())
}

Expand Down