Merge #3172

3172: 1-based columns r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 10 insertions, 24 deletions

diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index 6a0e447b9..750cbab86 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -132,25 +132,16 @@ 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")?;
-            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 {
-                panic!("either --highlight or --complete must be set")
+            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)?;
@@ -183,8 +174,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..]))
-}