11 files changed, 244 insertions, 163 deletions

diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index a14139b26..ffc9e16bb 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -89,6 +89,10 @@ pub fn load(
                         vfs.root2path(root)
                     );
                     analysis_change.add_root(source_root_id, is_local);
+                    analysis_change.set_debug_root_path(
+                        source_root_id,
+                        source_roots[&source_root_id].path().display().to_string(),
+                    );
 
                     let mut file_map = FxHashMap::default();
                     for (vfs_file, path, text) in files {
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index 1fad5b233..8f4ce42da 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -4,9 +4,14 @@ use ra_db::SourceDatabase;
 use ra_hir::{Crate, HasBodySource, HasSource, HirDisplay, ImplItem, ModuleDef, Ty, TypeWalk};
 use ra_syntax::AstNode;
 
-use crate::Result;
+use crate::{Result, Verbosity};
 
-pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -> Result<()> {
+pub fn run(
+    verbosity: Verbosity,
+    memory_usage: bool,
+    path: &Path,
+    only: Option<&str>,
+) -> Result<()> {
     let db_load_time = Instant::now();
     let (mut host, roots) = ra_batch::load_cargo(path)?;
     let db = host.raw_database();
@@ -55,10 +60,14 @@ pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -
     println!("Item Collection: {:?}, {}", analysis_time.elapsed(), ra_prof::memory_usage());
 
     let inference_time = Instant::now();
-    let bar = indicatif::ProgressBar::with_draw_target(
-        funcs.len() as u64,
-        indicatif::ProgressDrawTarget::stderr_nohz(),
-    );
+    let bar = match verbosity {
+        Verbosity::Verbose | Verbosity::Normal => indicatif::ProgressBar::with_draw_target(
+            funcs.len() as u64,
+            indicatif::ProgressDrawTarget::stderr_nohz(),
+        ),
+        Verbosity::Quiet => indicatif::ProgressBar::hidden(),
+    };
+
     bar.set_style(
         indicatif::ProgressStyle::default_bar().template("{wide_bar} {pos}/{len}\n{msg}"),
     );
@@ -70,7 +79,7 @@ pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -
     for f in funcs {
         let name = f.name(db);
         let mut msg = format!("processing: {}", name);
-        if verbose {
+        if verbosity.is_verbose() {
             let src = f.source(db);
             let original_file = src.file_id.original_file(db);
             let path = db.file_relative_path(original_file);
@@ -103,7 +112,7 @@ pub fn run(verbose: bool, memory_usage: bool, path: &Path, only: Option<&str>) -
             }
             if let Some(mismatch) = inference_result.type_mismatch_for_expr(expr_id) {
                 num_type_mismatches += 1;
-                if verbose {
+                if verbosity.is_verbose() {
                     let src = f.expr_source(db, expr_id);
                     if let Some(src) = src {
                         // FIXME: it might be nice to have a function (on Analysis?) that goes from Source<T> -> (LineCol, LineCol) directly
diff --git a/crates/ra_cli/src/help.rs b/crates/ra_cli/src/help.rs
index 5171578f0..2a74b8733 100644
--- a/crates/ra_cli/src/help.rs
+++ b/crates/ra_cli/src/help.rs
@@ -1,72 +1,73 @@
-pub const GLOBAL_HELP: &str = "ra-cli

-

-USAGE:

-    ra_cli <SUBCOMMAND>

-

-FLAGS:

-    -h, --help        Prints help information

-

-SUBCOMMANDS:

-    analysis-bench

-    analysis-stats

-    highlight

-    parse

-    symbols";

-

-pub const ANALYSIS_BENCH_HELP: &str = "ra_cli-analysis-bench

-

-USAGE:

-    ra_cli analysis-bench [FLAGS] [OPTIONS] [PATH]

-

-FLAGS:

-    -h, --help        Prints help information

-    -v, --verbose

-    

-OPTIONS:

-    --complete <PATH:LINE:COLUMN>    Compute completions at this location

-    --highlight <PATH>               Hightlight this file

-    

-ARGS:

-    <PATH>    Project to analyse";

-

-pub const ANALYSIS_STATS_HELP: &str = "ra-cli-analysis-stats

-

-USAGE:

-    ra_cli analysis-stats [FLAGS] [OPTIONS] [PATH]

-    

-FLAGS:

-    -h, --help            Prints help information

-        --memory-usage

-    -v, --verbose

-    

-OPTIONS:

-    -o <ONLY>

-    

-ARGS:

-    <PATH>";

-

-pub const HIGHLIGHT_HELP: &str = "ra-cli-highlight

-    

-USAGE:

-    ra_cli highlight [FLAGS]

-    

-FLAGS:

-    -h, --help       Prints help information

-    -r, --rainbow";

-

-pub const SYMBOLS_HELP: &str = "ra-cli-symbols

-    

-USAGE:

-    ra_cli highlight [FLAGS]

-    

-FLAGS:

-    -h, --help    Prints help inforamtion";

-

-pub const PARSE_HELP: &str = "ra-cli-parse

-    

-USAGE:

-    ra_cli parse [FLAGS]

-    

-FLAGS:

-    -h, --help       Prints help inforamtion

-        --no-dump";

+pub const GLOBAL_HELP: &str = "ra-cli
+
+USAGE:
+    ra_cli <SUBCOMMAND>
+
+FLAGS:
+    -h, --help        Prints help information
+
+SUBCOMMANDS:
+    analysis-bench
+    analysis-stats
+    highlight
+    parse
+    symbols";
+
+pub const ANALYSIS_BENCH_HELP: &str = "ra_cli-analysis-bench
+
+USAGE:
+    ra_cli analysis-bench [FLAGS] [OPTIONS] [PATH]
+
+FLAGS:
+    -h, --help        Prints help information
+    -v, --verbose
+
+OPTIONS:
+    --complete <PATH:LINE:COLUMN>    Compute completions at this location
+    --highlight <PATH>               Hightlight this file
+
+ARGS:
+    <PATH>    Project to analyse";
+
+pub const ANALYSIS_STATS_HELP: &str = "ra-cli-analysis-stats
+
+USAGE:
+    ra_cli analysis-stats [FLAGS] [OPTIONS] [PATH]
+
+FLAGS:
+    -h, --help            Prints help information
+        --memory-usage
+    -v, --verbose
+    -q, --quiet
+
+OPTIONS:
+    -o <ONLY>
+
+ARGS:
+    <PATH>";
+
+pub const HIGHLIGHT_HELP: &str = "ra-cli-highlight
+
+USAGE:
+    ra_cli highlight [FLAGS]
+
+FLAGS:
+    -h, --help       Prints help information
+    -r, --rainbow";
+
+pub const SYMBOLS_HELP: &str = "ra-cli-symbols
+
+USAGE:
+    ra_cli highlight [FLAGS]
+
+FLAGS:
+    -h, --help    Prints help inforamtion";
+
+pub const PARSE_HELP: &str = "ra-cli-parse
+
+USAGE:
+    ra_cli parse [FLAGS]
+
+FLAGS:
+    -h, --help       Prints help inforamtion
+        --no-dump";
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index e6334cf56..ca9275cd4 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -12,6 +12,22 @@ use ra_syntax::{AstNode, SourceFile};
 
 type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
 
+#[derive(Clone, Copy)]
+pub enum Verbosity {
+    Verbose,
+    Normal,
+    Quiet,
+}
+
+impl Verbosity {
+    fn is_verbose(&self) -> bool {
+        match self {
+            Verbosity::Verbose => true,
+            _ => false,
+        }
+    }
+}
+
 fn main() -> Result<()> {
     Logger::with_env().start()?;
 
@@ -67,13 +83,27 @@ fn main() -> Result<()> {
                 eprintln!("{}", help::ANALYSIS_STATS_HELP);
                 return Ok(());
             }
-            let verbose = matches.contains(["-v", "--verbose"]);
+            let verbosity = match (
+                matches.contains(["-v", "--verbose"]),
+                matches.contains(["-q", "--quiet"]),
+            ) {
+                (false, false) => Verbosity::Normal,
+                (false, true) => Verbosity::Quiet,
+                (true, false) => Verbosity::Verbose,
+                (true, true) => Err("Invalid flags: -q conflicts with -v")?,
+            };
             let memory_usage = matches.contains("--memory-usage");
-            let path: String = matches.value_from_str("--path")?.unwrap_or_default();
             let only = matches.value_from_str(["-o", "--only"])?.map(|v: String| v.to_owned());
-            matches.finish().or_else(handle_extra_flags)?;
+            let path = {
+                let mut trailing = matches.free()?;
+                if trailing.len() != 1 {
+                    eprintln!("{}", help::ANALYSIS_STATS_HELP);
+                    Err("Invalid flags")?;
+                }
+                trailing.pop().unwrap()
+            };
             analysis_stats::run(
-                verbose,
+                verbosity,
                 memory_usage,
                 path.as_ref(),
                 only.as_ref().map(String::as_ref),
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 162ab02b1..d26a024ed 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
 use ra_syntax::{
     ast::{self, AstNode},
-    AstPtr, SourceFile,
+    AstPtr,
 };
 
 use crate::{
@@ -29,12 +29,12 @@ impl ImplSourceMap {
     }
 
     pub fn get(&self, source: &ModuleSource, impl_id: ImplId) -> ast::ImplBlock {
-        let file = match source {
-            ModuleSource::SourceFile(file) => file.clone(),
-            ModuleSource::Module(m) => m.syntax().ancestors().find_map(SourceFile::cast).unwrap(),
+        let root = match source {
+            ModuleSource::SourceFile(file) => file.syntax().clone(),
+            ModuleSource::Module(m) => m.syntax().ancestors().last().unwrap(),
         };
 
-        self.map[impl_id].to_node(file.syntax()).to_owned()
+        self.map[impl_id].to_node(&root)
     }
 }
 
diff --git a/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
index 708dc9777..6fcef4a72 100644
--- a/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
+++ b/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
@@ -37,14 +37,42 @@ mod tests {
             ),
             @r##"[
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [46; 46),
         delete: [46; 46),
-        insert: "foo!",
+        insert: "foo!($0)",
         kind: Macro,
         detail: "macro_rules! foo",
     },
 ]"##
         );
     }
+
+    #[test]
+    fn completes_vec_macros_with_square_brackets() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                "
+                //- /main.rs
+                macro_rules! vec {
+                    () => {}
+                }
+
+                fn foo() {}
+
+                <|>
+                "
+            ),
+            @r##"[
+    CompletionItem {
+        label: "vec!",
+        source_range: [46; 46),
+        delete: [46; 46),
+        insert: "vec![$0]",
+        kind: Macro,
+        detail: "macro_rules! vec",
+    },
+]"##
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index 31e7dffe8..457a3d10c 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -605,10 +605,10 @@ mod tests {
             ),
             @r###"[
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [179; 179),
         delete: [179; 179),
-        insert: "foo!",
+        insert: "foo!($0)",
         kind: Macro,
         detail: "#[macro_export]\nmacro_rules! foo",
     },
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 2062e7300..2ea22876f 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -568,26 +568,26 @@ mod tests {
             ),
             @r##"[
     CompletionItem {
-        label: "bar",
+        label: "bar!",
         source_range: [252; 252),
         delete: [252; 252),
-        insert: "bar!",
+        insert: "bar!($0)",
         kind: Macro,
         detail: "macro_rules! bar",
     },
     CompletionItem {
-        label: "baz",
+        label: "baz!",
         source_range: [252; 252),
         delete: [252; 252),
-        insert: "baz!",
+        insert: "baz!($0)",
         kind: Macro,
         detail: "#[macro_export]\nmacro_rules! baz",
     },
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [252; 252),
         delete: [252; 252),
-        insert: "foo!",
+        insert: "foo!($0)",
         kind: Macro,
         detail: "macro_rules! foo",
     },
@@ -637,17 +637,17 @@ mod tests {
         label: "foo",
         source_range: [49; 49),
         delete: [49; 49),
-        insert: "foo!",
-        kind: Macro,
-        detail: "macro_rules! foo",
+        insert: "foo()$0",
+        kind: Function,
+        detail: "fn foo()",
     },
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [49; 49),
         delete: [49; 49),
-        insert: "foo()$0",
-        kind: Function,
-        detail: "fn foo()",
+        insert: "foo!($0)",
+        kind: Macro,
+        detail: "macro_rules! foo",
     },
 ]"##
         );
@@ -670,10 +670,10 @@ mod tests {
             ),
             @r##"[
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [57; 57),
         delete: [57; 57),
-        insert: "foo!",
+        insert: "foo!($0)",
         kind: Macro,
         detail: "macro_rules! foo",
     },
@@ -706,10 +706,10 @@ mod tests {
             ),
             @r##"[
     CompletionItem {
-        label: "foo",
+        label: "foo!",
         source_range: [50; 50),
         delete: [50; 50),
-        insert: "foo!",
+        insert: "foo!($0)",
         kind: Macro,
         detail: "macro_rules! foo",
     },
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 1b706bb13..5cabe9a32 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -109,12 +109,21 @@ impl Completions {
         if let Some(name) = name {
             let detail = macro_label(&ast_node);
 
-            let builder =
-                CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone())
-                    .kind(CompletionItemKind::Macro)
-                    .set_documentation(macro_.docs(ctx.db))
-                    .detail(detail)
-                    .insert_snippet(format!("{}!", name));
+            let macro_braces_to_insert = match name.as_str() {
+                "vec" => "[$0]",
+                _ => "($0)",
+            };
+            let macro_declaration = name + "!";
+
+            let builder = CompletionItem::new(
+                CompletionKind::Reference,
+                ctx.source_range(),
+                &macro_declaration,
+            )
+            .kind(CompletionItemKind::Macro)
+            .set_documentation(macro_.docs(ctx.db))
+            .detail(detail)
+            .insert_snippet(macro_declaration + macro_braces_to_insert);
 
             self.add(builder);
         }
diff --git a/crates/ra_parser/src/parser.rs b/crates/ra_parser/src/parser.rs
index a2ac363fb..f8fba6860 100644
--- a/crates/ra_parser/src/parser.rs
+++ b/crates/ra_parser/src/parser.rs
@@ -5,7 +5,7 @@ use drop_bomb::DropBomb;
 use crate::{
     event::Event,
     ParseError,
-    SyntaxKind::{self, EOF, ERROR, L_DOLLAR, R_DOLLAR, TOMBSTONE},
+    SyntaxKind::{self, EOF, ERROR, TOMBSTONE},
     TokenSet, TokenSource, T,
 };
 
@@ -212,7 +212,7 @@ impl<'t> Parser<'t> {
     /// Create an error node and consume the next token.
     pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) {
         match self.current() {
-            T!['{'] | T!['}'] | L_DOLLAR | R_DOLLAR => {
+            T!['{'] | T!['}'] => {
                 self.error(message);
                 return;
             }
diff --git a/crates/ra_tools/src/help.rs b/crates/ra_tools/src/help.rs
index 6dde6c2d2..9eb4dfbe4 100644
--- a/crates/ra_tools/src/help.rs
+++ b/crates/ra_tools/src/help.rs
@@ -1,45 +1,45 @@
-pub const GLOBAL_HELP: &str = "tasks

-

-USAGE:

-    ra_tools <SUBCOMMAND>

-

-FLAGS:

-    -h, --help       Prints help information

-

-SUBCOMMANDS:

-    format

-    format-hook

-    fuzz-tests

-    gen-syntax

-    gen-tests

-    install-ra

-    lint";

-

-pub const INSTALL_RA_HELP: &str = "ra_tools-install-ra

-

-USAGE:

-    ra_tools.exe install-ra [FLAGS]

-

-FLAGS:

-        --client-code

-    -h, --help           Prints help information

-        --jemalloc

-        --server";

-

-pub fn print_no_param_subcommand_help(subcommand: &str) {

-    eprintln!(

-        "ra_tools-{}

-

-USAGE:

-    ra_tools {}

-

-FLAGS:

-    -h, --help       Prints help information",

-        subcommand, subcommand

-    );

-}

-

-pub const INSTALL_RA_CONFLICT: &str =

-    "error: The argument `--server` cannot be used with `--client-code`

-                    

-For more information try --help";

+pub const GLOBAL_HELP: &str = "tasks
+
+USAGE:
+    ra_tools <SUBCOMMAND>
+
+FLAGS:
+    -h, --help       Prints help information
+
+SUBCOMMANDS:
+    format
+    format-hook
+    fuzz-tests
+    gen-syntax
+    gen-tests
+    install-ra
+    lint";
+
+pub const INSTALL_RA_HELP: &str = "ra_tools-install-ra
+
+USAGE:
+    ra_tools.exe install-ra [FLAGS]
+
+FLAGS:
+        --client-code
+    -h, --help           Prints help information
+        --jemalloc
+        --server";
+
+pub fn print_no_param_subcommand_help(subcommand: &str) {
+    eprintln!(
+        "ra_tools-{}
+
+USAGE:
+    ra_tools {}
+
+FLAGS:
+    -h, --help       Prints help information",
+        subcommand, subcommand
+    );
+}
+
+pub const INSTALL_RA_CONFLICT: &str =
+    "error: The argument `--server` cannot be used with `--client-code`
+                    
+For more information try --help";