2 files changed, 16 insertions, 35 deletions

diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index 4516ed660..e6b2b30c6 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -7,9 +7,9 @@ use ra_syntax::AstNode;
 
 use crate::Result;
 
-pub fn run(verbose: bool) -> Result<()> {
+pub fn run(verbose: bool, path: &str, only: Option<&str>) -> Result<()> {
     let db_load_time = Instant::now();
-    let (db, roots) = BatchDatabase::load_cargo(".")?;
+    let (db, roots) = BatchDatabase::load_cargo(path)?;
     println!("Database loaded, {} roots, {:?}", roots.len(), db_load_time.elapsed());
     let analysis_time = Instant::now();
     let mut num_crates = 0;
@@ -57,14 +57,19 @@ pub fn run(verbose: bool) -> Result<()> {
     let mut num_exprs_unknown = 0;
     let mut num_exprs_partially_unknown = 0;
     for f in funcs {
+        let name = f.name(&db);
         if verbose {
             let (file_id, source) = f.source(&db);
             let original_file = file_id.original_file(&db);
             let path = db.file_relative_path(original_file);
             let syntax_range = source.syntax().range();
-            let name = f.name(&db);
             println!("{} ({:?} {})", name, path, syntax_range);
         }
+        if let Some(only_name) = only {
+            if name.to_string() != only_name {
+                continue;
+            }
+        }
         let body = f.body(&db);
         let inference_result = f.infer(&db);
         for (expr_id, _) in body.exprs() {
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index 45555be6e..038f5f3fe 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -1,11 +1,10 @@
 mod analysis_stats;
 
-use std::{fs, io::Read, path::Path};
+use std::io::Read;
 
 use clap::{App, Arg, SubCommand};
 use ra_ide_api::file_structure;
 use ra_syntax::{SourceFile, TreeArc, AstNode};
-use tools::collect_tests;
 use flexi_logger::Logger;
 use ra_prof::profile;
 
@@ -15,15 +14,13 @@ fn main() -> Result<()> {
     Logger::with_env().start()?;
     let matches = App::new("ra-cli")
         .setting(clap::AppSettings::SubcommandRequiredElseHelp)
-        .subcommand(
-            SubCommand::with_name("render-test")
-                .arg(Arg::with_name("line").long("--line").required(true).takes_value(true))
-                .arg(Arg::with_name("file").long("--file").required(true).takes_value(true)),
-        )
         .subcommand(SubCommand::with_name("parse").arg(Arg::with_name("no-dump").long("--no-dump")))
         .subcommand(SubCommand::with_name("symbols"))
         .subcommand(
-            SubCommand::with_name("analysis-stats").arg(Arg::with_name("verbose").short("v")),
+            SubCommand::with_name("analysis-stats")
+                .arg(Arg::with_name("verbose").short("v"))
+                .arg(Arg::with_name("only").short("o").takes_value(true))
+                .arg(Arg::with_name("path")),
         )
         .get_matches();
     match matches.subcommand() {
@@ -41,17 +38,11 @@ fn main() -> Result<()> {
                 println!("{:?}", s);
             }
         }
-        ("render-test", Some(matches)) => {
-            let file = matches.value_of("file").unwrap();
-            let file = Path::new(file);
-            let line: usize = matches.value_of("line").unwrap().parse()?;
-            let line = line - 1;
-            let (test, tree) = render_test(file, line)?;
-            println!("{}\n{}", test, tree);
-        }
         ("analysis-stats", Some(matches)) => {
             let verbose = matches.is_present("verbose");
-            analysis_stats::run(verbose)?;
+            let path = matches.value_of("path").unwrap_or("");
+            let only = matches.value_of("only");
+            analysis_stats::run(verbose, path, only)?;
         }
         _ => unreachable!(),
     }
@@ -68,18 +59,3 @@ fn read_stdin() -> Result<String> {
     ::std::io::stdin().read_to_string(&mut buff)?;
     Ok(buff)
 }
-
-fn render_test(file: &Path, line: usize) -> Result<(String, String)> {
-    let text = fs::read_to_string(file)?;
-    let tests = collect_tests(&text);
-    let test = tests.into_iter().find(|(start_line, t)| {
-        *start_line <= line && line <= *start_line + t.text.lines().count()
-    });
-    let test = match test {
-        None => failure::bail!("No test found at line {} at {}", line, file.display()),
-        Some((_start_line, test)) => test,
-    };
-    let file = SourceFile::parse(&test.text);
-    let tree = file.syntax().debug_dump();
-    Ok((test.text, tree))
-}