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

enhanced surround_replace to provide visual feedback #7588

Merged
merged 7 commits into from
Jul 13, 2023
Merged

enhanced surround_replace to provide visual feedback #7588

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f26677d
enhance(sourround_replace): provide visual feedback during the operation
alevinval Jul 10, 2023
a558743
feedback: much cleaner `for_each` logic
alevinval Jul 10, 2023
c9c392e
idiomatic loop
alevinval Jul 10, 2023
6127ff3
Keep simplifying: update transaction to work on selection, stop chunk…
alevinval Jul 11, 2023
b5835b5
do not touch transaction code
alevinval Jul 11, 2023
6dd6347
Compute correct primary index to minimize view movement
alevinval Jul 12, 2023
7917f63
Finding the primary index on the new selection is easy
alevinval Jul 12, 2023
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
19 changes: 12 additions & 7 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5115,21 +5115,26 @@ fn surround_replace(cx: &mut Context) {
}
};

let original_selection = selection.clone();
let ranges: SmallVec<_> = change_pos.iter().map(|&p| Range::new(p, p + 1)).collect();
doc.set_selection(view.id, Selection::new(ranges, 0));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, one last thing: you need to compute the correct primary_idx here or the view will be moved if you have a lot of selections: if you selected all the lines in a very big file and were viewing somewhere further down, an index of 0 would move the view all the way to the top

Something like

let primary = selection.primary();
let (i, _) = ranges.iter().enumerate().find(|_i, range| range.overlaps(primary))...

Selection::new(ranges, i)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I've pushed this change and so far so good during smoke testing, but I wonder if there's a better way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a better way. There should be twice as many matches (surrounding positions) as original selections, so the primary index of this selection is twice the original selection primary index.


cx.on_next_key(move |cx, event| {
archseer marked this conversation as resolved.
Show resolved Hide resolved
let (view, doc) = current!(cx.editor);
let to = match event.char() {
Some(to) => to,
None => return,
None => return doc.set_selection(view.id, original_selection),
};
let (open, close) = surround::get_pair(to);
let transaction = Transaction::change(
doc.text(),
change_pos.iter().enumerate().map(|(i, &pos)| {
let mut i = 0;
let transaction =
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
let mut t = Tendril::new();
t.push(if i % 2 == 0 { open } else { close });
(pos, pos + 1, Some(t))
}),
);
i += 1;
(range.from(), range.to(), Some(t))
});
alevinval marked this conversation as resolved.
Show resolved Hide resolved
doc.set_selection(view.id, original_selection);
doc.apply(&transaction, view.id);
exit_select_mode(cx);
});
Expand Down