git.iko.soy/helix
on master help sign in
Allow specifying file start position (#445)

Like helix-term/src/commands.rs:3426:15

commit759b850859727da9ef3e3c06cdab0300d242f1fe authorIvan Tham <pickfire@riseup.net> dateSun 23 Jan 2022, 15:54 (5 years ago) parent7d51042
5 files changed+80−15
compare with master
unifiedsplit
helix-core/src/position.rs+11−1 helix-term/src/application.rs+18−5 helix-term/src/args.rs+40−5 helix-term/src/commands.rs+10−3 helix-term/src/main.rs+1−1
helix-core/src/position.rs+11−1
@@ -109,7 +109,10 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po
109109/// TODO: this should be changed to work in terms of visual row/column, not
110110/// graphemes.
111111pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending: bool) -> usize {
112− let Position { row, col } = coords;
112+ let Position { mut row, col } = coords;
113+ if limit_before_line_ending {
114+ row = row.min(text.len_lines() - 1);
115+ };
113116 let line_start = text.line_to_char(row);
114117 let line_end = if limit_before_line_ending {
115118 line_end_char_index(&text, row)
@@ -290,5 +293,12 @@ mod test {
290293 assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
291294 assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 1);
292295 assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2);
296+
297+ // Test out of bounds.
298+ let text = Rope::new();
299+ let slice = text.slice(..);
300+ assert_eq!(pos_at_coords(slice, (10, 0).into(), true), 0);
301+ assert_eq!(pos_at_coords(slice, (0, 10).into(), true), 0);
302+ assert_eq!(pos_at_coords(slice, (10, 10).into(), true), 0);
293303 }
294304}
helix-term/src/application.rs+18−5
@@ -1,10 +1,14 @@
1−use helix_core::{merge_toml_values, syntax};
1+use helix_core::{merge_toml_values, pos_at_coords, syntax, Selection};
22use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
33use helix_view::{theme, Editor};
44use serde_json::json;
55
66use crate::{
7− args::Args, commands::apply_workspace_edit, compositor::Compositor, config::Config, job::Jobs,
7+ args::Args,
8+ commands::{align_view, apply_workspace_edit, Align},
9+ compositor::Compositor,
10+ config::Config,
11+ job::Jobs,
812 ui,
913};
1014
@@ -130,7 +134,7 @@ impl Application {
130134 // Unset path to prevent accidentally saving to the original tutor file.
131135 doc_mut!(editor).set_path(None)?;
132136 } else if !args.files.is_empty() {
133− let first = &args.files[0]; // we know it's not empty
137+ let first = &args.files[0].0; // we know it's not empty
134138 if first.is_dir() {
135139 std::env::set_current_dir(&first)?;
136140 editor.new_file(Action::VerticalSplit);
@@ -138,16 +142,25 @@ impl Application {
138142 } else {
139143 let nr_of_files = args.files.len();
140144 editor.open(first.to_path_buf(), Action::VerticalSplit)?;
141− for file in args.files {
145+ for (file, pos) in args.files {
142146 if file.is_dir() {
143147 return Err(anyhow::anyhow!(
144148 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
145149 ));
146150 } else {
147− editor.open(file.to_path_buf(), Action::Load)?;
151+ let doc_id = editor.open(file, Action::Load)?;
152+ // with Action::Load all documents have the same view
153+ let view_id = editor.tree.focus;
154+ let doc = editor.document_mut(doc_id).unwrap();
155+ let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
156+ doc.set_selection(view_id, pos);
148157 }
149158 }
150159 editor.set_status(format!("Loaded {} files.", nr_of_files));
160+ // align the view to center after all files are loaded,
161+ // does not affect views without pos since it is at the top
162+ let (view, doc) = current!(editor);
163+ align_view(doc, view, Align::Center);
151164 }
152165 } else if stdin().is_tty() {
153166 editor.new_file(Action::VerticalSplit);
helix-term/src/args.rs+40−5
@@ -1,5 +1,6 @@
11use anyhow::{Error, Result};
2−use std::path::PathBuf;
2+use helix_core::Position;
3+use std::path::{Path, PathBuf};
34
45#[derive(Default)]
56pub struct Args {
@@ -7,7 +8,7 @@ pub struct Args {
78 pub display_version: bool,
89 pub load_tutor: bool,
910 pub verbosity: u64,
10− pub files: Vec<PathBuf>,
11+ pub files: Vec<(PathBuf, Position)>,
1112}
1213
1314impl Args {
@@ -41,15 +42,49 @@ impl Args {
4142 }
4243 }
4344 }
44− arg => args.files.push(PathBuf::from(arg)),
45+ arg => args.files.push(parse_file(arg)),
4546 }
4647 }
4748
4849 // push the remaining args, if any to the files
49− for filename in iter {
50− args.files.push(PathBuf::from(filename));
50+ for arg in iter {
51+ args.files.push(parse_file(arg));
5152 }
5253
5354 Ok(args)
5455 }
5556}
57+
58+/// Parse arg into [`PathBuf`] and position.
59+pub(crate) fn parse_file(s: &str) -> (PathBuf, Position) {
60+ let def = || (PathBuf::from(s), Position::default());
61+ if Path::new(s).exists() {
62+ return def();
63+ }
64+ split_path_row_col(s)
65+ .or_else(|| split_path_row(s))
66+ .unwrap_or_else(def)
67+}
68+
69+/// Split file.rs:10:2 into [`PathBuf`], row and col.
70+///
71+/// Does not validate if file.rs is a file or directory.
72+fn split_path_row_col(s: &str) -> Option<(PathBuf, Position)> {
73+ let mut s = s.rsplitn(3, ':');
74+ let col: usize = s.next()?.parse().ok()?;
75+ let row: usize = s.next()?.parse().ok()?;
76+ let path = s.next()?.into();
77+ let pos = Position::new(row.saturating_sub(1), col.saturating_sub(1));
78+ Some((path, pos))
79+}
80+
81+/// Split file.rs:10 into [`PathBuf`] and row.
82+///
83+/// Does not validate if file.rs is a file or directory.
84+fn split_path_row(s: &str) -> Option<(PathBuf, Position)> {
85+ let (row, path) = s.rsplit_once(':')?;
86+ let row: usize = row.parse().ok()?;
87+ let path = path.into();
88+ let pos = Position::new(row.saturating_sub(1), 0);
89+ Some((path, pos))
90+}
helix-term/src/commands.rs+10−3
@@ -37,6 +37,7 @@ use insert::*;
3737use movement::Movement;
3838
3939use crate::{
40+ args,
4041 compositor::{self, Component, Compositor},
4142 ui::{self, FilePicker, Picker, Popup, Prompt, PromptEvent},
4243};
@@ -113,13 +114,13 @@ impl<'a> Context<'a> {
113114 }
114115}
115116
116−enum Align {
117+pub(crate) enum Align {
117118 Top,
118119 Center,
119120 Bottom,
120121}
121122
122−fn align_view(doc: &Document, view: &mut View, align: Align) {
123+pub(crate) fn align_view(doc: &Document, view: &mut View, align: Align) {
123124 let pos = doc
124125 .selection(view.id)
125126 .primary()
@@ -2028,7 +2029,13 @@ pub mod cmd {
20282029 ) -> anyhow::Result<()> {
20292030 ensure!(!args.is_empty(), "wrong argument count");
20302031 for arg in args {
2031− let _ = cx.editor.open(arg.as_ref().into(), Action::Replace)?;
2032+ let (path, pos) = args::parse_file(arg);
2033+ let _ = cx.editor.open(path, Action::Replace)?;
2034+ let (view, doc) = current!(cx.editor);
2035+ let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
2036+ doc.set_selection(view.id, pos);
2037+ // does not affect opening a buffer without pos
2038+ align_view(doc, view, Align::Center);
20322039 }
20332040 Ok(())
20342041 }
helix-term/src/main.rs+1−1
@@ -56,7 +56,7 @@ USAGE:
5656 hx [FLAGS] [files]...
5757
5858ARGS:
59− <files>... Sets the input file to use
59+ <files>... Sets the input file to use, position can also be specified via file[:row[:col]]
6060
6161FLAGS:
6262 -h, --help Prints help information