Merge pull request helix-editor#66 from IceDragon200/replaced-args-pa…

…rser

Drop pico-args in favour of a hand rolled parser

helix-term/Cargo.toml

@@ -24,7 +24,6 @@ tokio = { version = "1", features = ["full"] }
 num_cpus = "1"
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
 crossterm = { version = "0.19", features = ["event-stream"] }
-pico-args = "0.4"
 
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 

helix-term/src/main.rs

@@ -12,7 +12,7 @@ use helix_core::config_dir;
 
 use std::path::PathBuf;
 
-use anyhow::{Context, Result};
+use anyhow::{Context, Error, Result};
 
 fn setup_logging(verbosity: u64) -> Result<()> {
  let mut base_config = fern::Dispatch::new();
@@ -48,9 +48,52 @@ fn setup_logging(verbosity: u64) -> Result<()> {
 }
 
 pub struct Args {
+ display_help: bool,
+ display_version: bool,
+ verbosity: u64,
  files: Vec<PathBuf>,
 }
 
+fn parse_args(mut args: Args) -> Result<Args> {
+ let argv: Vec<String> = std::env::args().collect();
+ let mut iter = argv.iter();
+
+ iter.next(); // skip the program, we don't care about that
+
+ while let Some(arg) = iter.next() {
+ match arg.as_str() {
+ "--" => break, // stop parsing at this point treat the remaining as files
+ "--version" => args.display_version = true,
+ "--help" => args.display_help = true,
+ arg if arg.starts_with("--") => {
+ return Err(Error::msg(format!(
+ "unexpected double dash argument: {}",
+ arg
+ )))
+ }
+ arg if arg.starts_with('-') => {
+ let arg = arg.get(1..).unwrap().chars();
+ for chr in arg {
+ match chr {
+ 'v' => args.verbosity += 1,
+ 'V' => args.display_version = true,
+ 'h' => args.display_help = true,
+ _ => return Err(Error::msg(format!("unexpected short arg {}", chr))),
+ }
+ }
+ }
+ arg => args.files.push(PathBuf::from(arg)),
+ }
+ }
+
+ // push the remaining args, if any to the files
+ for filename in iter {
+ args.files.push(PathBuf::from(filename));
+ }
+
+ Ok(args)
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
  let help = format!(
@@ -76,18 +119,24 @@ FLAGS:
  env!("CARGO_PKG_DESCRIPTION"),
  );
 
- let mut pargs = pico_args::Arguments::from_env();
+ let mut args: Args = Args {
+ display_help: false,
+ display_version: false,
+ verbosity: 0,
+ files: [].to_vec(),
+ };
+
+ args = parse_args(args).context("could not parse arguments")?;
 
  // Help has a higher priority and should be handled separately.
- if pargs.contains(["-h", "--help"]) {
+ if args.display_help {
  print!("{}", help);
  std::process::exit(0);
  }
 
- let mut verbosity: u64 = 0;
-
- if pargs.contains("-v") {
- verbosity = 1;
+ if args.display_version {
+ println!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
+ std::process::exit(0);
  }
 
  let conf_dir = config_dir();
@@ -96,11 +145,7 @@ FLAGS:
  std::fs::create_dir(&conf_dir);
  }
 
- setup_logging(verbosity).context("failed to initialize logging")?;
-
- let args = Args {
- files: pargs.finish().into_iter().map(|arg| arg.into()).collect(),
- };
+ setup_logging(args.verbosity).context("failed to initialize logging")?;
 
  // initialize language registry
  use helix_core::syntax::{Loader, LOADER};