language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor arg parsing

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-17 18:02:10 +01:00
parent 90e61ac75d
commit 017f0e4e53
1 changed files with 168 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

282
crates/ra_cli/src/main.rs
View file

@ -14,6 +14,15 @@ use ra_syntax::{AstNode, SourceFile};
type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
fn main() -> Result<()> {
env_logger::try_init()?;
let command = Command::from_args()?;
command.run()?;
Ok(())
}
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub enum Verbosity { pub enum Verbosity {
Spammy, Spammy,
@ -37,17 +46,40 @@ impl Verbosity {
} }
} }
fn main() -> Result<()> { enum Command {
env_logger::try_init()?; Parse {
no_dump: bool,
},
Symbols,
Highlight {
rainbow: bool,
},
Stats {
verbosity: Verbosity,
randomize: bool,
memory_usage: bool,
only: Option<String>,
with_deps: bool,
path: String,
},
Bench {
verbose: bool,
path: String,
op: analysis_bench::Op,
},
HelpPrinted,
}
let mut matches = Arguments::from_env(); impl Command {
let subcommand = matches.subcommand()?.unwrap_or_default(); fn from_args() -> Result<Command> {
let mut matches = Arguments::from_env();
let subcommand = matches.subcommand()?.unwrap_or_default();
match subcommand.as_str() { let command = match subcommand.as_str() {
"parse" => { "parse" => {
if matches.contains(["-h", "--help"]) { if matches.contains(["-h", "--help"]) {
eprintln!( eprintln!(
"\ "\
ra-cli-parse ra-cli-parse
USAGE: USAGE:
@ -56,24 +88,18 @@ USAGE:
FLAGS: FLAGS:
-h, --help Prints help inforamtion -h, --help Prints help inforamtion
--no-dump" --no-dump"
); );
return Ok(()); return Ok(Command::HelpPrinted);
} }
let no_dump = matches.contains("--no-dump"); let no_dump = matches.contains("--no-dump");
matches.finish().or_else(handle_extra_flags)?; matches.finish().or_else(handle_extra_flags)?;
Command::Parse { no_dump }
let _p = profile("parsing");
let file = file()?;
if !no_dump {
println!("{:#?}", file.syntax());
} }
std::mem::forget(file); "symbols" => {
} if matches.contains(["-h", "--help"]) {
"symbols" => { eprintln!(
if matches.contains(["-h", "--help"]) { "\
eprintln!(
"\
ra-cli-symbols ra-cli-symbols
USAGE: USAGE:
@ -81,21 +107,18 @@ USAGE:
FLAGS: FLAGS:
-h, --help Prints help inforamtion" -h, --help Prints help inforamtion"
); );
return Ok(()); return Ok(Command::HelpPrinted);
} }
matches.finish().or_else(handle_extra_flags)?; matches.finish().or_else(handle_extra_flags)?;
let file = file()?; Command::Symbols
for s in file_structure(&file) {
println!("{:?}", s);
} }
} "highlight" => {
"highlight" => { if matches.contains(["-h", "--help"]) {
if matches.contains(["-h", "--help"]) { eprintln!(
eprintln!( "\
"\
ra-cli-highlight ra-cli-highlight
USAGE: USAGE:
@ -104,21 +127,18 @@ USAGE:
FLAGS: FLAGS:
-h, --help Prints help information -h, --help Prints help information
-r, --rainbow" -r, --rainbow"
); );
return Ok(()); return Ok(Command::HelpPrinted);
}
let rainbow = matches.contains(["-r", "--rainbow"]);
matches.finish().or_else(handle_extra_flags)?;
Command::Highlight { rainbow }
} }
"analysis-stats" => {
let rainbow_opt = matches.contains(["-r", "--rainbow"]); if matches.contains(["-h", "--help"]) {
matches.finish().or_else(handle_extra_flags)?; eprintln!(
"\
let (analysis, file_id) = Analysis::from_single_file(read_stdin()?);
let html = analysis.highlight_as_html(file_id, rainbow_opt).unwrap();
println!("{}", html);
}
"analysis-stats" => {
if matches.contains(["-h", "--help"]) {
eprintln!(
"\
ra-cli-analysis-stats ra-cli-analysis-stats
USAGE: USAGE:
@ -135,47 +155,40 @@ OPTIONS:
ARGS: ARGS:
<PATH>" <PATH>"
); );
return Ok(()); return Ok(Command::HelpPrinted);
}
let verbosity = match (
matches.contains(["-vv", "--spammy"]),
matches.contains(["-v", "--verbose"]),
matches.contains(["-q", "--quiet"]),
) {
(true, _, true) => Err("Invalid flags: -q conflicts with -vv")?,
(true, _, false) => Verbosity::Spammy,
(false, false, false) => Verbosity::Normal,
(false, false, true) => Verbosity::Quiet,
(false, true, false) => Verbosity::Verbose,
(false, true, true) => Err("Invalid flags: -q conflicts with -v")?,
};
let randomize = matches.contains("--randomize");
let memory_usage = matches.contains("--memory-usage");
let only: Option<String> = matches.opt_value_from_str(["-o", "--only"])?;
let with_deps: bool = matches.contains("--with-deps");
let path = {
let mut trailing = matches.free()?;
if trailing.len() != 1 {
Err("Invalid flags")?;
} }
trailing.pop().unwrap()
};
analysis_stats::run( let verbosity = match (
verbosity, matches.contains(["-vv", "--spammy"]),
memory_usage, matches.contains(["-v", "--verbose"]),
path.as_ref(), matches.contains(["-q", "--quiet"]),
only.as_ref().map(String::as_ref), ) {
with_deps, (true, _, true) => Err("Invalid flags: -q conflicts with -vv")?,
randomize, (true, _, false) => Verbosity::Spammy,
)?; (false, false, false) => Verbosity::Normal,
} (false, false, true) => Verbosity::Quiet,
"analysis-bench" => { (false, true, false) => Verbosity::Verbose,
if matches.contains(["-h", "--help"]) { (false, true, true) => Err("Invalid flags: -q conflicts with -v")?,
eprintln!( };
"\ let randomize = matches.contains("--randomize");
let memory_usage = matches.contains("--memory-usage");
let only: Option<String> = matches.opt_value_from_str(["-o", "--only"])?;
let with_deps: bool = matches.contains("--with-deps");
let path = {
let mut trailing = matches.free()?;
if trailing.len() != 1 {
Err("Invalid flags")?;
}
trailing.pop().unwrap()
};
Command::Stats { verbosity, randomize, memory_usage, only, with_deps, path }
}
"analysis-bench" => {
if matches.contains(["-h", "--help"]) {
eprintln!(
"\
ra_cli-analysis-bench ra_cli-analysis-bench
USAGE: USAGE:
@ -191,29 +204,28 @@ OPTIONS:
ARGS: ARGS:
<PATH> Project to analyse" <PATH> Project to analyse"
); );
return Ok(()); return Ok(Command::HelpPrinted);
}
let verbose = matches.contains(["-v", "--verbose"]);
let path: String = matches.opt_value_from_str("--path")?.unwrap_or_default();
let highlight_path: Option<String> = matches.opt_value_from_str("--highlight")?;
let complete_path: Option<String> = matches.opt_value_from_str("--complete")?;
let goto_def_path: Option<String> = matches.opt_value_from_str("--goto-def")?;
let op = match (highlight_path, complete_path, goto_def_path) {
(Some(path), None, None) => analysis_bench::Op::Highlight { path: path.into() },
(None, Some(position), None) => analysis_bench::Op::Complete(position.parse()?),
(None, None, Some(position)) => analysis_bench::Op::GotoDef(position.parse()?),
_ => panic!(
"exactly one of `--highlight`, `--complete` or `--goto-def` must be set"
),
};
Command::Bench { verbose, path, op }
} }
_ => {
let verbose = matches.contains(["-v", "--verbose"]); eprintln!(
let path: String = matches.opt_value_from_str("--path")?.unwrap_or_default(); "\
let highlight_path: Option<String> = matches.opt_value_from_str("--highlight")?;
let complete_path: Option<String> = matches.opt_value_from_str("--complete")?;
let goto_def_path: Option<String> = matches.opt_value_from_str("--goto-def")?;
let op = match (highlight_path, complete_path, goto_def_path) {
(Some(path), None, None) => analysis_bench::Op::Highlight { path: path.into() },
(None, Some(position), None) => analysis_bench::Op::Complete(position.parse()?),
(None, None, Some(position)) => analysis_bench::Op::GotoDef(position.parse()?),
_ => panic!(
"exactly one of `--highlight`, `--complete` or `--goto-def` must be set"
),
};
matches.finish().or_else(handle_extra_flags)?;
analysis_bench::run(verbose, path.as_ref(), op)?;
}
_ => eprintln!(
"\
ra-cli ra-cli
USAGE: USAGE:
@ -228,9 +240,51 @@ SUBCOMMANDS:
highlight highlight
parse parse
symbols" symbols"
), );
return Ok(Command::HelpPrinted);
}
};
Ok(command)
}
fn run(self) -> Result<()> {
match self {
Command::Parse { no_dump } => {
let _p = profile("parsing");
let file = file()?;
if !no_dump {
println!("{:#?}", file.syntax());
}
std::mem::forget(file);
}
Command::Symbols => {
let file = file()?;
for s in file_structure(&file) {
println!("{:?}", s);
}
}
Command::Highlight { rainbow } => {
let (analysis, file_id) = Analysis::from_single_file(read_stdin()?);
let html = analysis.highlight_as_html(file_id, rainbow).unwrap();
println!("{}", html);
}
Command::Stats { verbosity, randomize, memory_usage, only, with_deps, path } => {
analysis_stats::run(
verbosity,
memory_usage,
path.as_ref(),
only.as_ref().map(String::as_ref),
with_deps,
randomize,
)?;
}
Command::Bench { verbose, path, op } => {
analysis_bench::run(verbose, path.as_ref(), op)?;
}
Command::HelpPrinted => (),
}
Ok(())
} }
Ok(())
} }
fn handle_extra_flags(e: pico_args::Error) -> Result<()> { fn handle_extra_flags(e: pico_args::Error) -> Result<()> {