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

Use range positions to determine insert_newline motion #9448

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Use range positions to determine insert_newline motion #9448

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84a0117
use anchor and head positions to determine motion
wmstack Jan 27, 2024
8703ad4
use range cursor to decide extending or shifting
wmstack Jan 27, 2024
40f0e0e
add condition to cursor moving back on normal
wmstack Jan 29, 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
3 changes: 1 addition & 2 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3650,8 +3650,7 @@ pub mod insert {

(pos, pos, local_offs)
};

let new_range = if doc.restore_cursor {
let new_range = if range.head > range.anchor {
Copy link
Member

Choose a reason for hiding this comment

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

This will also extend if you enter insert mode via o (open_below), O (open_above), or mouse click when in insert mode and then hit enter. Instead I believe we want to check range.cursor(text) > range.anchor to avoid cases where the range is a point (Range::point)

Copy link
Contributor Author

@wmstack wmstack Jan 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Done. However, I am not too familiar with range.cursor(text). I have run it and it seems to be working fine for my use-cases.

// when appending, extend the range by local_offs
Range::new(
range.anchor + global_offs,
Expand Down
Loading