aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCor2021-07-14 19:29:39 +0000
committerBlaž Hrastnik2021-07-17 15:29:05 +0000
commit9fcbbfa46762484fc132383d9c2855ce37f60d6f (patch)
tree769979b8da28c9469f9226dffb71f3545eba609f
parent000b7b7c977aef59907011dd9a14d7a5d76826da (diff)
Changed startup behaviour to only open a single view when multiple files are specified on the commandline.
Changed the behaviour; the first argument on the commandline is the file on display
-rw-r--r--helix-term/src/application.rs5
-rw-r--r--helix-view/src/editor.rs4
2 files changed, 8 insertions, 1 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 79dd7c3b..c55d4c98 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -83,15 +83,18 @@ impl Application {
editor.new_file(Action::VerticalSplit);
compositor.push(Box::new(ui::file_picker(first.clone())));
} else {
+ let nr_of_files = args.files.len();
+ editor.open(first.to_path_buf(), Action::VerticalSplit)?;
for file in args.files {
if file.is_dir() {
return Err(anyhow::anyhow!(
"expected a path to file, found a directory. (to open a directory pass it as first argument)"
));
} else {
- editor.open(file, Action::VerticalSplit)?;
+ editor.open(file.to_path_buf(), Action::Load)?;
}
}
+ editor.set_status(format!("Loaded {} files.", nr_of_files));
}
} else {
editor.new_file(Action::VerticalSplit);
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index a468b87c..cd9d0a92 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -39,6 +39,7 @@ pub struct Editor {
#[derive(Debug, Copy, Clone)]
pub enum Action {
+ Load,
Replace,
HorizontalSplit,
VerticalSplit,
@@ -151,6 +152,9 @@ impl Editor {
return;
}
+ Action::Load => {
+ return;
+ }
Action::HorizontalSplit => {
let view = View::new(id);
let view_id = self.tree.split(view, Layout::Horizontal);