Skip to content

Support negative line numbers for goto #841

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

Open
barkure wants to merge 2 commits into
base: main
Choose a base branch
from
+71 −45
Open

Support negative line numbers for goto #841

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0c73dc
Support negative line numbers for goto
barkure May 1, 2026
df94c24
Simplify negative goto target handling
barkure May 4, 2026
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
111 changes: 73 additions & 38 deletions crates/edit/src/bin/edit/documents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,28 @@ pub struct Document {
pub language_override: Option<Option<&'static Language>>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct GotoTarget {
column: CoordType,
line: CoordType,
}

impl GotoTarget {
pub fn new(line: CoordType, column: CoordType) -> Self {
Self { column: column.saturating_sub(1), line }
}

pub fn resolve(self, line_count: CoordType) -> Point {
let line = if self.line < 0 {
line_count.saturating_add(self.line)
} else {
self.line.saturating_sub(1)
};

Point { x: self.column, y: line.max(0) }
}
Copy link
Copy Markdown
Member

@lhecker lhecker May 4, 2026

Choose a reason for hiding this comment

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

To me it seems unnecessary to introduce a new type just to wrap a single if condition in a function. It should be fine to keep using Point and just move the if/else into the code below.

John Carmack wrote many years ago "If a function is only called from a single place, consider inlining it." It is as true as it has ever been.

}

impl Document {
pub fn save(&mut self, new_path: Option<PathBuf>) -> apperr::Result<()> {
let path = new_path.as_deref().unwrap_or_else(|| self.path.as_ref().unwrap().as_path());
Expand Down Expand Up @@ -209,7 +231,9 @@ impl DocumentManager {
if file_id.is_some() && self.update_active(|doc| doc.file_id == file_id) {
let doc = self.active_mut().unwrap();
if let Some(goto) = goto {
doc.buffer.borrow_mut().cursor_move_to_logical(goto);
let mut tb = doc.buffer.borrow_mut();
let goto = goto.resolve(tb.logical_line_count());
tb.cursor_move_to_logical(goto);
}
return Ok(doc);
}
Expand All @@ -220,10 +244,11 @@ impl DocumentManager {
let mut tb = buffer.borrow_mut();
tb.read_file(file, None)?;

if let Some(goto) = goto
&& goto != Default::default()
{
tb.cursor_move_to_logical(goto);
if let Some(goto) = goto {
let goto = goto.resolve(tb.logical_line_count());
if goto != Default::default() {
tb.cursor_move_to_logical(goto);
}
}
}
}
Expand Down Expand Up @@ -291,21 +316,29 @@ impl DocumentManager {

// Parse a filename in the form of "filename:line:char".
// Returns the position of the first colon and the line/char coordinates.
fn parse_filename_goto(path: &Path) -> (&Path, Option<Point>) {
fn parse(s: &[u8]) -> Option<CoordType> {
fn parse_filename_goto(path: &Path) -> (&Path, Option<GotoTarget>) {
fn parse(s: &[u8], allow_negative: bool) -> Option<CoordType> {
if s.is_empty() {
return None;
}

let (negative, digits) = match s {
[b'-', rest @ ..] if allow_negative => (true, rest),
_ => (false, s),
};
if digits.is_empty() {
return None;
}

let mut num: CoordType = 0;
for &b in s {
for &b in digits {
if !b.is_ascii_digit() {
return None;
}
let digit = (b - b'0') as CoordType;
num = num.checked_mul(10)?.checked_add(digit)?;
}
Some(num)
Some(if negative { -num } else { num })
}

fn find_colon_rev(bytes: &[u8], offset: usize) -> Option<usize> {
Expand All @@ -320,24 +353,22 @@ impl DocumentManager {
_ => return (path, None),
};

let last = match parse(&bytes[colend + 1..]) {
Some(last) => last,
None => return (path, None),
};
let last = (last - 1).max(0);
let mut len = colend;
let mut goto = Point { x: 0, y: last };

if let Some(colbeg) = find_colon_rev(bytes, colend) {
// Same here: Don't allow empty filenames.
if colbeg != 0
&& let Some(first) = parse(&bytes[colbeg + 1..colend])
{
let first = (first - 1).max(0);
len = colbeg;
goto = Point { x: last, y: first };
}
}
let goto = if let Some(colbeg) = find_colon_rev(bytes, colend)
&& colbeg != 0
&& let Some(line) = parse(&bytes[colbeg + 1..colend], true)
{
let Some(column) = parse(&bytes[colend + 1..], false) else {
return (path, None);
};
len = colbeg;
GotoTarget::new(line, column)
} else {
let Some(line) = parse(&bytes[colend + 1..], true) else {
return (path, None);
};
GotoTarget::new(line, 1)
};

// Strip off the :line:char suffix.
let path = &bytes[..len];
Expand All @@ -353,28 +384,32 @@ mod tests {

#[test]
fn test_parse_last_numbers() {
fn parse(s: &str) -> (&str, Option<Point>) {
fn parse(s: &str) -> (&str, Option<GotoTarget>) {
let (p, g) = DocumentManager::parse_filename_goto(Path::new(s));
(p.to_str().unwrap(), g)
}

assert_eq!(parse("123"), ("123", None));
assert_eq!(parse("abc"), ("abc", None));
assert_eq!(parse(":123"), (":123", None));
assert_eq!(parse("abc:123"), ("abc", Some(Point { x: 0, y: 122 })));
assert_eq!(parse("45:123"), ("45", Some(Point { x: 0, y: 122 })));
assert_eq!(parse(":45:123"), (":45", Some(Point { x: 0, y: 122 })));
assert_eq!(parse("abc:45:123"), ("abc", Some(Point { x: 122, y: 44 })));
assert_eq!(parse("abc:def:123"), ("abc:def", Some(Point { x: 0, y: 122 })));
assert_eq!(parse("1:2:3"), ("1", Some(Point { x: 2, y: 1 })));
assert_eq!(parse("::3"), (":", Some(Point { x: 0, y: 2 })));
assert_eq!(parse("1::3"), ("1:", Some(Point { x: 0, y: 2 })));
assert_eq!(parse("abc:123"), ("abc", Some(GotoTarget::new(123, 1))));
assert_eq!(parse("45:123"), ("45", Some(GotoTarget::new(123, 1))));
assert_eq!(parse(":45:123"), (":45", Some(GotoTarget::new(123, 1))));
assert_eq!(parse("abc:45:123"), ("abc", Some(GotoTarget::new(45, 123))));
assert_eq!(parse("abc:def:123"), ("abc:def", Some(GotoTarget::new(123, 1))));
assert_eq!(parse("1:2:3"), ("1", Some(GotoTarget::new(2, 3))));
assert_eq!(parse("::3"), (":", Some(GotoTarget::new(3, 1))));
assert_eq!(parse("1::3"), ("1:", Some(GotoTarget::new(3, 1))));
assert_eq!(parse(""), ("", None));
assert_eq!(parse(":"), (":", None));
assert_eq!(parse("::"), ("::", None));
assert_eq!(parse("a:1"), ("a", Some(Point { x: 0, y: 0 })));
assert_eq!(parse("a:1"), ("a", Some(GotoTarget::new(1, 1))));
assert_eq!(parse("1:a"), ("1:a", None));
assert_eq!(parse("file.txt:10"), ("file.txt", Some(Point { x: 0, y: 9 })));
assert_eq!(parse("file.txt:10:5"), ("file.txt", Some(Point { x: 4, y: 9 })));
assert_eq!(parse("file.txt:10"), ("file.txt", Some(GotoTarget::new(10, 1))));
assert_eq!(parse("file.txt:10:5"), ("file.txt", Some(GotoTarget::new(10, 5))));
assert_eq!(parse("file.txt:-1"), ("file.txt", Some(GotoTarget::new(-1, 1))));
assert_eq!(parse("file.txt:-5"), ("file.txt", Some(GotoTarget::new(-5, 1))));
assert_eq!(parse("file.txt:-10:5"), ("file.txt", Some(GotoTarget::new(-10, 5))));
assert_eq!(parse("file.txt:10:-5"), ("file.txt:10:-5", None));
}
}
19 changes: 10 additions & 9 deletions crates/edit/src/bin/edit/draw_editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use edit::input::{kbmod, vk};
use edit::tui::*;
use stdext::string_from_utf8_lossy_owned;

use crate::documents::GotoTarget;
use crate::localization::*;
use crate::state::*;

Expand Down Expand Up @@ -320,8 +321,9 @@ pub fn draw_goto_menu(ctx: &mut Context, state: &mut State) {

if ctx.consume_shortcut(vk::RETURN) {
match validate_goto_point(&state.goto_target) {
Ok(point) => {
Ok(goto) => {
let mut buf = doc.buffer.borrow_mut();
let point = goto.resolve(buf.logical_line_count());
buf.cursor_move_to_logical(point);
buf.make_cursor_visible();
done = true;
Expand All @@ -344,13 +346,12 @@ pub fn draw_goto_menu(ctx: &mut Context, state: &mut State) {
}
}

fn validate_goto_point(line: &str) -> Result<Point, ParseIntError> {
let mut coords = [0; 2];
let (y, x) = line.split_once(':').unwrap_or((line, "0"));
// Using a loop here avoids 2 copies of the str->int code.
// This makes the binary more compact.
for (i, s) in [x, y].iter().enumerate() {
coords[i] = s.parse::<CoordType>()?.saturating_sub(1);
fn validate_goto_point(line: &str) -> Result<GotoTarget, ParseIntError> {
let (y, x) = line.split_once(':').unwrap_or((line, "1"));
let y = y.parse::<CoordType>()?;
let x = x.parse::<CoordType>()?;
if x <= 0 {
return Err("".parse::<CoordType>().unwrap_err());
}
Ok(Point { x: coords[0], y: coords[1] })
Ok(GotoTarget::new(y, x))
}