Allow specifying file start position (#445)

Like helix-term/src/commands.rs:3426:15
pull/1363/head
Ivan Tham 3 years ago committed by GitHub
parent 7d510429c5
commit 759b850859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -109,7 +109,10 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po
/// TODO: this should be changed to work in terms of visual row/column, not /// TODO: this should be changed to work in terms of visual row/column, not
/// graphemes. /// graphemes.
pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending: bool) -> usize { pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending: bool) -> usize {
let Position { row, col } = coords; let Position { mut row, col } = coords;
if limit_before_line_ending {
row = row.min(text.len_lines() - 1);
};
let line_start = text.line_to_char(row); let line_start = text.line_to_char(row);
let line_end = if limit_before_line_ending { let line_end = if limit_before_line_ending {
line_end_char_index(&text, row) line_end_char_index(&text, row)
@ -290,5 +293,12 @@ mod test {
assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0); assert_eq!(pos_at_coords(slice, (0, 0).into(), false), 0);
assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 1); assert_eq!(pos_at_coords(slice, (0, 1).into(), false), 1);
assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2); assert_eq!(pos_at_coords(slice, (0, 2).into(), false), 2);
// Test out of bounds.
let text = Rope::new();
let slice = text.slice(..);
assert_eq!(pos_at_coords(slice, (10, 0).into(), true), 0);
assert_eq!(pos_at_coords(slice, (0, 10).into(), true), 0);
assert_eq!(pos_at_coords(slice, (10, 10).into(), true), 0);
} }
} }

@ -1,10 +1,14 @@
use helix_core::{merge_toml_values, syntax}; use helix_core::{merge_toml_values, pos_at_coords, syntax, Selection};
use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{theme, Editor}; use helix_view::{theme, Editor};
use serde_json::json; use serde_json::json;
use crate::{ use crate::{
args::Args, commands::apply_workspace_edit, compositor::Compositor, config::Config, job::Jobs, args::Args,
commands::{align_view, apply_workspace_edit, Align},
compositor::Compositor,
config::Config,
job::Jobs,
ui, ui,
}; };
@ -130,7 +134,7 @@ impl Application {
// Unset path to prevent accidentally saving to the original tutor file. // Unset path to prevent accidentally saving to the original tutor file.
doc_mut!(editor).set_path(None)?; doc_mut!(editor).set_path(None)?;
} else if !args.files.is_empty() { } else if !args.files.is_empty() {
let first = &args.files[0]; // we know it's not empty let first = &args.files[0].0; // we know it's not empty
if first.is_dir() { if first.is_dir() {
std::env::set_current_dir(&first)?; std::env::set_current_dir(&first)?;
editor.new_file(Action::VerticalSplit); editor.new_file(Action::VerticalSplit);
@ -138,16 +142,25 @@ impl Application {
} else { } else {
let nr_of_files = args.files.len(); let nr_of_files = args.files.len();
editor.open(first.to_path_buf(), Action::VerticalSplit)?; editor.open(first.to_path_buf(), Action::VerticalSplit)?;
for file in args.files { for (file, pos) in args.files {
if file.is_dir() { if file.is_dir() {
return Err(anyhow::anyhow!( return Err(anyhow::anyhow!(
"expected a path to file, found a directory. (to open a directory pass it as first argument)" "expected a path to file, found a directory. (to open a directory pass it as first argument)"
)); ));
} else { } else {
editor.open(file.to_path_buf(), Action::Load)?; let doc_id = editor.open(file, Action::Load)?;
// with Action::Load all documents have the same view
let view_id = editor.tree.focus;
let doc = editor.document_mut(doc_id).unwrap();
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
doc.set_selection(view_id, pos);
} }
} }
editor.set_status(format!("Loaded {} files.", nr_of_files)); editor.set_status(format!("Loaded {} files.", nr_of_files));
// align the view to center after all files are loaded,
// does not affect views without pos since it is at the top
let (view, doc) = current!(editor);
align_view(doc, view, Align::Center);
} }
} else if stdin().is_tty() { } else if stdin().is_tty() {
editor.new_file(Action::VerticalSplit); editor.new_file(Action::VerticalSplit);

@ -1,5 +1,6 @@
use anyhow::{Error, Result}; use anyhow::{Error, Result};
use std::path::PathBuf; use helix_core::Position;
use std::path::{Path, PathBuf};
#[derive(Default)] #[derive(Default)]
pub struct Args { pub struct Args {
@ -7,7 +8,7 @@ pub struct Args {
pub display_version: bool, pub display_version: bool,
pub load_tutor: bool, pub load_tutor: bool,
pub verbosity: u64, pub verbosity: u64,
pub files: Vec<PathBuf>, pub files: Vec<(PathBuf, Position)>,
} }
impl Args { impl Args {
@ -41,15 +42,49 @@ impl Args {
} }
} }
} }
arg => args.files.push(PathBuf::from(arg)), arg => args.files.push(parse_file(arg)),
} }
} }
// push the remaining args, if any to the files // push the remaining args, if any to the files
for filename in iter { for arg in iter {
args.files.push(PathBuf::from(filename)); args.files.push(parse_file(arg));
} }
Ok(args) Ok(args)
} }
} }
/// Parse arg into [`PathBuf`] and position.
pub(crate) fn parse_file(s: &str) -> (PathBuf, Position) {
let def = || (PathBuf::from(s), Position::default());
if Path::new(s).exists() {
return def();
}
split_path_row_col(s)
.or_else(|| split_path_row(s))
.unwrap_or_else(def)
}
/// Split file.rs:10:2 into [`PathBuf`], row and col.
///
/// Does not validate if file.rs is a file or directory.
fn split_path_row_col(s: &str) -> Option<(PathBuf, Position)> {
let mut s = s.rsplitn(3, ':');
let col: usize = s.next()?.parse().ok()?;
let row: usize = s.next()?.parse().ok()?;
let path = s.next()?.into();
let pos = Position::new(row.saturating_sub(1), col.saturating_sub(1));
Some((path, pos))
}
/// Split file.rs:10 into [`PathBuf`] and row.
///
/// Does not validate if file.rs is a file or directory.
fn split_path_row(s: &str) -> Option<(PathBuf, Position)> {
let (row, path) = s.rsplit_once(':')?;
let row: usize = row.parse().ok()?;
let path = path.into();
let pos = Position::new(row.saturating_sub(1), 0);
Some((path, pos))
}

@ -37,6 +37,7 @@ use insert::*;
use movement::Movement; use movement::Movement;
use crate::{ use crate::{
args,
compositor::{self, Component, Compositor}, compositor::{self, Component, Compositor},
ui::{self, FilePicker, Picker, Popup, Prompt, PromptEvent}, ui::{self, FilePicker, Picker, Popup, Prompt, PromptEvent},
}; };
@ -113,13 +114,13 @@ impl<'a> Context<'a> {
} }
} }
enum Align { pub(crate) enum Align {
Top, Top,
Center, Center,
Bottom, Bottom,
} }
fn align_view(doc: &Document, view: &mut View, align: Align) { pub(crate) fn align_view(doc: &Document, view: &mut View, align: Align) {
let pos = doc let pos = doc
.selection(view.id) .selection(view.id)
.primary() .primary()
@ -2028,7 +2029,13 @@ pub mod cmd {
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
ensure!(!args.is_empty(), "wrong argument count"); ensure!(!args.is_empty(), "wrong argument count");
for arg in args { for arg in args {
let _ = cx.editor.open(arg.as_ref().into(), Action::Replace)?; let (path, pos) = args::parse_file(arg);
let _ = cx.editor.open(path, Action::Replace)?;
let (view, doc) = current!(cx.editor);
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
doc.set_selection(view.id, pos);
// does not affect opening a buffer without pos
align_view(doc, view, Align::Center);
} }
Ok(()) Ok(())
} }

@ -56,7 +56,7 @@ USAGE:
hx [FLAGS] [files]... hx [FLAGS] [files]...
ARGS: ARGS:
<files>... Sets the input file to use <files>... Sets the input file to use, position can also be specified via file[:row[:col]]
FLAGS: FLAGS:
-h, --help Prints help information -h, --help Prints help information

Loading…
Cancel
Save