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 position parsing

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-16 18:17:35 +01:00
parent 98cc51580d
commit 2ba918775c
2 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,22 +133,15 @@ fn main() -> Result<()> {
let verbose = matches.contains(["-v", "--verbose"]);
let path: String = matches.opt_value_from_str("--path")?.unwrap_or_default();
let highlight_path = matches.opt_value_from_str("--highlight")?;
let complete_path = matches.opt_value_from_str("--complete")?;
let complete_path: Option<String> = matches.opt_value_from_str("--complete")?;
if highlight_path.is_some() && complete_path.is_some() {
panic!("either --highlight or --complete must be set, not both")
}
let op = if let Some(path) = highlight_path {
let path: String = path;
analysis_bench::Op::Highlight { path: path.into() }
} else if let Some(path_line_col) = complete_path {
let path_line_col: String = path_line_col;
let (path_line, column) = rsplit_at_char(path_line_col.as_str(), ':')?;
let (path, line) = rsplit_at_char(path_line, ':')?;
analysis_bench::Op::Complete {
path: path.into(),
line: line.parse()?,
column: column.parse()?,
}
} else if let Some(position) = complete_path {
analysis_bench::Op::Complete(position.parse()?)
} else {
panic!("either --highlight or --complete must be set")
};
@ -183,8 +176,3 @@ fn read_stdin() -> Result<String> {
std::io::stdin().read_to_string(&mut buff)?;
Ok(buff)
}
fn rsplit_at_char(s: &str, c: char) -> Result<(&str, &str)> {
let idx = s.rfind(':').ok_or_else(|| format!("no `{}` in {}", c, s))?;
Ok((&s[..idx], &s[idx + 1..]))
}