From b52f28d6d5d740a85e539cde221b6742106f488f Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 9 Jul 2020 11:28:07 -0700
Subject: [PATCH] Allow measuring time for tags subcommand

---
 cli/src/main.rs | 20 ++++++++++++---
 cli/src/tags.rs | 67 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/cli/src/main.rs b/cli/src/main.rs
index 757c70eb..d7a5e7b1 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -97,6 +97,8 @@ fn run() -> error::Result<()> {
                         .value_name("json|protobuf")
                         .help("Determine output format (default: json)"),
                 )
+                .arg(Arg::with_name("quiet").long("quiet").short("q"))
+                .arg(Arg::with_name("time").long("quiet").short("t"))
                 .arg(Arg::with_name("scope").long("scope").takes_value(true))
                 .arg(
                     Arg::with_name("inputs")
@@ -149,8 +151,14 @@ fn run() -> error::Result<()> {
                 .arg(Arg::with_name("path").index(1).multiple(true)),
         )
         .subcommand(
-            SubCommand::with_name("web-ui").about("Test a parser interactively in the browser")
-                .arg(Arg::with_name("quiet").long("quiet").short("q").help("open in default browser")),
+            SubCommand::with_name("web-ui")
+                .about("Test a parser interactively in the browser")
+                .arg(
+                    Arg::with_name("quiet")
+                        .long("quiet")
+                        .short("q")
+                        .help("open in default browser"),
+                ),
         )
         .subcommand(
             SubCommand::with_name("dump-languages")
@@ -268,7 +276,13 @@ fn run() -> error::Result<()> {
     } else if let Some(matches) = matches.subcommand_matches("tags") {
         loader.find_all_languages(&config.parser_directories)?;
         let paths = collect_paths(matches.values_of("inputs").unwrap())?;
-        tags::generate_tags(&loader, matches.value_of("scope"), &paths)?;
+        tags::generate_tags(
+            &loader,
+            matches.value_of("scope"),
+            &paths,
+            matches.is_present("quiet"),
+            matches.is_present("time"),
+        )?;
     } else if let Some(matches) = matches.subcommand_matches("highlight") {
         loader.configure_highlights(&config.theme.highlight_names);
         loader.find_all_languages(&config.parser_directories)?;
diff --git a/cli/src/tags.rs b/cli/src/tags.rs
index 515f4c52..5ea00f39 100644
--- a/cli/src/tags.rs
+++ b/cli/src/tags.rs
@@ -3,10 +3,17 @@ use super::util;
 use crate::error::{Error, Result};
 use std::io::{self, Write};
 use std::path::Path;
+use std::time::Instant;
 use std::{fs, str};
 use tree_sitter_tags::TagsContext;
 
-pub fn generate_tags(loader: &Loader, scope: Option<&str>, paths: &[String]) -> Result<()> {
+pub fn generate_tags(
+    loader: &Loader,
+    scope: Option<&str>,
+    paths: &[String],
+    quiet: bool,
+    time: bool,
+) -> Result<()> {
     let mut lang = None;
     if let Some(scope) = scope {
         lang = loader.language_configuration_for_scope(scope)?;
@@ -34,36 +41,50 @@ pub fn generate_tags(loader: &Loader, scope: Option<&str>, paths: &[String]) ->
         };
 
         if let Some(tags_config) = language_config.tags_config(language)? {
-            let ident = if paths.len() > 1 {
-                let path_str = format!("{:?}", path);
-                writeln!(&mut stdout, "{}", &path_str[1..path_str.len() - 1])?;
-                "\t"
+            let indent;
+            if paths.len() > 1 {
+                if !quiet {
+                    writeln!(&mut stdout, "{}", path.to_string_lossy())?;
+                }
+                indent = "\t"
             } else {
-                ""
+                indent = "";
             };
 
             let source = fs::read(path)?;
+            let t0 = Instant::now();
             for tag in context.generate_tags(tags_config, &source, Some(&cancellation_flag))? {
                 let tag = tag?;
-                write!(
-                    &mut stdout,
-                    "{}{:<10}\t | {:<8}\t{} {} - {} `{}`",
-                    ident,
-                    str::from_utf8(&source[tag.name_range]).unwrap_or(""),
-                    &tags_config.syntax_type_name(tag.syntax_type_id),
-                    if tag.is_definition { "def" } else { "ref" },
-                    tag.span.start,
-                    tag.span.end,
-                    str::from_utf8(&source[tag.line_range]).unwrap_or(""),
-                )?;
-                if let Some(docs) = tag.docs {
-                    if docs.len() > 120 {
-                        write!(&mut stdout, "\t{:?}...", &docs[0..120])?;
-                    } else {
-                        write!(&mut stdout, "\t{:?}", &docs)?;
+                if !quiet {
+                    write!(
+                        &mut stdout,
+                        "{}{:<10}\t | {:<8}\t{} {} - {} `{}`",
+                        indent,
+                        str::from_utf8(&source[tag.name_range]).unwrap_or(""),
+                        &tags_config.syntax_type_name(tag.syntax_type_id),
+                        if tag.is_definition { "def" } else { "ref" },
+                        tag.span.start,
+                        tag.span.end,
+                        str::from_utf8(&source[tag.line_range]).unwrap_or(""),
+                    )?;
+                    if let Some(docs) = tag.docs {
+                        if docs.len() > 120 {
+                            write!(&mut stdout, "\t{:?}...", &docs[0..120])?;
+                        } else {
+                            write!(&mut stdout, "\t{:?}", &docs)?;
+                        }
                     }
+                    writeln!(&mut stdout, "")?;
                 }
-                writeln!(&mut stdout, "")?;
+            }
+
+            if time {
+                writeln!(
+                    &mut stdout,
+                    "{}time: {}ms",
+                    indent,
+                    t0.elapsed().as_millis(),
+                )?;
             }
         } else {
             eprintln!("No tags config found for path {:?}", path);