18 files changed, 126 insertions, 45 deletions

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index b75dfa0d3..2c0da0665 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -184,6 +184,8 @@ To see logs from the language server, set `RUST_LOG=info` env variable. To see
 all communication between the server and the client, use
 `RUST_LOG=gen_lsp_server=debug` (this will print quite a bit of stuff).
 
+There's `Status of rust-analyzer` command which prints common high-level debug info.
+
 To run tests, just `cargo test`.
 
 To work on the VS Code extension, launch code inside `editors/code` and use `F5` to
diff --git a/Cargo.lock b/Cargo.lock
index cb0706087..9a495a69d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -826,7 +826,7 @@ dependencies = [
  "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ra_text_edit 0.1.0",
- "rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rowan 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "test_utils 0.1.0",
  "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1041,7 +1041,7 @@ dependencies = [
 
 [[package]]
 name = "rowan"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1685,7 +1685,7 @@ dependencies = [
 "checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
 "checksum ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9cb28ade964585205aaca1f3d41a6297f72e1ad097b49c4bbde033ef86b38d7"
-"checksum rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "660069534501214380ab070b979f4b41e8cf3a5279ae07d0e949675efbd595bd"
+"checksum rowan 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "acefc6f0bfd48f98b1d4424bf53c6b1c9dd379d69376e862ba3c44d29773602c"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index 18b9508ef..798fb7c13 100644
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -1,5 +1,3 @@
-use std::cmp::{max, min};
-
 use ra_db::SyntaxDatabase;
 use ra_syntax::{
     AstNode, SyntaxNode, TextUnit, TextRange,
@@ -107,15 +105,13 @@ impl<'a> FnCallNode<'a> {
 
 impl CallInfo {
     fn new(node: &ast::FnDef) -> Option<Self> {
-        let mut doc = None;
-
-        // Strip the body out for the label.
-        let mut label: String = if let Some(body) = node.body() {
+        let label: String = if let Some(body) = node.body() {
             let body_range = body.syntax().range();
             let label: String = node
                 .syntax()
                 .children()
-                .filter(|child| !child.range().is_subrange(&body_range))
+                .filter(|child| !child.range().is_subrange(&body_range)) // Filter out body
+                .filter(|child| ast::Comment::cast(child).is_none()) // Filter out doc comments
                 .map(|node| node.text().to_string())
                 .collect();
             label
@@ -123,16 +119,9 @@ impl CallInfo {
             node.syntax().text().to_string()
         };
 
-        if let Some((comment_range, docs)) = extract_doc_comments(node) {
-            let comment_range = comment_range
-                .checked_sub(node.syntax().range().start())
-                .unwrap();
-            let start = comment_range.start().to_usize();
-            let end = comment_range.end().to_usize();
-
-            // Remove the comment from the label
-            label.replace_range(start..end, "");
-
+        let mut doc = None;
+        let docs = node.doc_comment_text();
+        if !docs.is_empty() {
             // Massage markdown
             let mut processed_lines = Vec::new();
             let mut in_code_block = false;
@@ -150,9 +139,7 @@ impl CallInfo {
                 processed_lines.push(line);
             }
 
-            if !processed_lines.is_empty() {
-                doc = Some(processed_lines.join("\n"));
-            }
+            doc = Some(processed_lines.join("\n"));
         }
 
         Some(CallInfo {
@@ -164,26 +151,6 @@ impl CallInfo {
     }
 }
 
-fn extract_doc_comments(node: &ast::FnDef) -> Option<(TextRange, String)> {
-    if node.doc_comments().count() == 0 {
-        return None;
-    }
-
-    let comment_text = node.doc_comment_text();
-
-    let (begin, end) = node
-        .doc_comments()
-        .map(|comment| comment.syntax().range())
-        .map(|range| (range.start().to_usize(), range.end().to_usize()))
-        .fold((std::usize::MAX, std::usize::MIN), |acc, range| {
-            (min(acc.0, range.0), max(acc.1, range.1))
-        });
-
-    let range = TextRange::from_to(TextUnit::from_usize(begin), TextUnit::from_usize(end));
-
-    Some((range, comment_text))
-}
-
 fn param_list(node: &ast::FnDef) -> Vec<String> {
     let mut res = vec![];
     if let Some(param_list) = node.param_list() {
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index a09a8f926..3c53e75ac 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -15,6 +15,7 @@ pub mod mock_analysis;
 mod symbol_index;
 mod navigation_target;
 
+mod status;
 mod completion;
 mod runnables;
 mod goto_definition;
@@ -293,6 +294,11 @@ pub struct Analysis {
 }
 
 impl Analysis {
+    /// Debug info about the current state of the analysis
+    pub fn status(&self) -> String {
+        status::status(&*self.db)
+    }
+
     /// Gets the text of the source file.
     pub fn file_text(&self, file_id: FileId) -> Arc<String> {
         self.db.file_text(file_id)
diff --git a/crates/ra_ide_api/src/status.rs b/crates/ra_ide_api/src/status.rs
new file mode 100644
index 000000000..d3e04be23
--- /dev/null
+++ b/crates/ra_ide_api/src/status.rs
@@ -0,0 +1,15 @@
+use ra_db::{
+    LocationIntener, SourceFileQuery,
+    salsa::{Database, debug::DebugQueryTable},
+};
+
+use crate::db::RootDatabase;
+
+pub(crate) fn status(db: &RootDatabase) -> String {
+    let n_parsed_files = db.query(SourceFileQuery).keys::<Vec<_>>().len();
+    let n_defs = {
+        let interner: &LocationIntener<hir::DefLoc, hir::DefId> = db.as_ref();
+        interner.len()
+    };
+    format!("#n_parsed_files {}\n#n_defs {}\n", n_parsed_files, n_defs)
+}
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index fa07b1942..f51576521 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -285,6 +285,7 @@ fn on_request(
         sender,
     };
     let req = pool_dispatcher
+        .on::<req::AnalyzerStatus>(handlers::handle_analyzer_status)?
         .on::<req::SyntaxTree>(handlers::handle_syntax_tree)?
         .on::<req::ExtendSelection>(handlers::handle_extend_selection)?
         .on::<req::FindMatchingBrace>(handlers::handle_find_matching_brace)?
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 497f819be..d84f762f4 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -23,6 +23,10 @@ use crate::{
     LspError, Result,
 };
 
+pub fn handle_analyzer_status(world: ServerWorld, _: ()) -> Result<String> {
+    Ok(world.status())
+}
+
 pub fn handle_syntax_tree(world: ServerWorld, params: req::SyntaxTreeParams) -> Result<String> {
     let id = params.text_document.try_conv_with(&world)?;
     let res = world.analysis().syntax_tree(id);
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index 156cf9641..ec6b6d905 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -11,6 +11,14 @@ pub use lsp_types::{
     TextDocumentPositionParams, TextEdit, WorkspaceEdit, WorkspaceSymbolParams,
 };
 
+pub enum AnalyzerStatus {}
+
+impl Request for AnalyzerStatus {
+    type Params = ();
+    type Result = String;
+    const METHOD: &'static str = "ra/analyzerStatus";
+}
+
 pub enum SyntaxTree {}
 
 impl Request for SyntaxTree {
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index c24ded9f9..5cb97b29b 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -264,4 +264,19 @@ impl ServerWorld {
             .map_err(|_| format_err!("can't convert path to url: {}", path.display()))?;
         Ok(url)
     }
+
+    pub fn status(&self) -> String {
+        let mut res = String::new();
+        if self.workspaces.is_empty() {
+            res.push_str("no workspaces\n")
+        } else {
+            res.push_str("workspaces:\n");
+            for w in self.workspaces.iter() {
+                res += &format!("{} packages loaded\n", w.cargo.packages().count());
+            }
+        }
+        res.push_str("\nanalysis:\n");
+        res.push_str(&self.analysis.status());
+        res
+    }
 }
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 05cf41a8d..c50dc6c67 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ unicode-xid = "0.1.0"
 itertools = "0.8.0"
 drop_bomb = "0.1.4"
 parking_lot = "0.7.0"
-rowan = "0.3.1"
+rowan = "0.3.2"
 
 # ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here
 # to reduce number of compilations
diff --git a/crates/ra_syntax/src/grammar/params.rs b/crates/ra_syntax/src/grammar/params.rs
index 658fc5820..13158429a 100644
--- a/crates/ra_syntax/src/grammar/params.rs
+++ b/crates/ra_syntax/src/grammar/params.rs
@@ -79,7 +79,12 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) {
             let la1 = p.nth(1);
             let la2 = p.nth(2);
             let la3 = p.nth(3);
-            if la0 == IDENT && la1 == COLON
+
+            // test trait_fn_placeholder_parameter
+            // trait Foo {
+            //     fn bar(_: u64);
+            // }
+            if (la0 == IDENT || la0 == UNDERSCORE) && la1 == COLON
                 || la0 == AMP && la1 == IDENT && la2 == COLON
                 || la0 == AMP && la1 == MUT_KW && la2 == IDENT && la3 == COLON
             {
diff --git a/crates/ra_syntax/src/yellow.rs b/crates/ra_syntax/src/yellow.rs
index 9b93945cc..a7bfb80e2 100644
--- a/crates/ra_syntax/src/yellow.rs
+++ b/crates/ra_syntax/src/yellow.rs
@@ -177,6 +177,10 @@ impl SyntaxNode {
     pub fn children(&self) -> SyntaxNodeChildren {
         SyntaxNodeChildren(self.0.children())
     }
+
+    pub fn memory_size_of_subtree(&self) -> usize {
+        self.0.memory_size_of_subtree()
+    }
 }
 
 impl fmt::Debug for SyntaxNode {
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs
new file mode 100644
index 000000000..aede3f4fe
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs
@@ -0,0 +1,3 @@
+trait Foo {
+    fn bar(_: u64);
+}
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt
new file mode 100644
index 000000000..248d491df
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt
@@ -0,0 +1,32 @@
+SOURCE_FILE@[0; 34)
+  TRAIT_DEF@[0; 33)
+    TRAIT_KW@[0; 5)
+    WHITESPACE@[5; 6)
+    NAME@[6; 9)
+      IDENT@[6; 9) "Foo"
+    WHITESPACE@[9; 10)
+    ITEM_LIST@[10; 33)
+      L_CURLY@[10; 11)
+      WHITESPACE@[11; 16)
+      FN_DEF@[16; 31)
+        FN_KW@[16; 18)
+        WHITESPACE@[18; 19)
+        NAME@[19; 22)
+          IDENT@[19; 22) "bar"
+        PARAM_LIST@[22; 30)
+          L_PAREN@[22; 23)
+          PARAM@[23; 29)
+            PLACEHOLDER_PAT@[23; 24)
+              UNDERSCORE@[23; 24)
+            COLON@[24; 25)
+            WHITESPACE@[25; 26)
+            PATH_TYPE@[26; 29)
+              PATH@[26; 29)
+                PATH_SEGMENT@[26; 29)
+                  NAME_REF@[26; 29)
+                    IDENT@[26; 29) "u64"
+          R_PAREN@[29; 30)
+        SEMI@[30; 31)
+      WHITESPACE@[31; 32)
+      R_CURLY@[32; 33)
+  WHITESPACE@[33; 34)
diff --git a/editors/code/package.json b/editors/code/package.json
index 9433bd3d2..3e07032c7 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -94,6 +94,10 @@
             {
                 "command": "ra-lsp.run",
                 "title": "Rust Run"
+            },
+            {
+                "command": "ra-lsp.analyzerStatus",
+                "title": "Status of rust-analyzer (debug)"
             }
         ],
         "keybindings": [
diff --git a/editors/code/src/commands/analyzer_status.ts b/editors/code/src/commands/analyzer_status.ts
new file mode 100644
index 000000000..5c56b9c4c
--- /dev/null
+++ b/editors/code/src/commands/analyzer_status.ts
@@ -0,0 +1,12 @@
+import * as vscode from 'vscode';
+import { Server } from '../server';
+
+// Shows status of rust-analyzer (for debugging)
+export async function handle() {
+    const status = await Server.client.sendRequest<string>(
+        'ra/analyzerStatus',
+        null
+    );
+    const doc = await vscode.workspace.openTextDocument({ content: status });
+    await vscode.window.showTextDocument(doc, vscode.ViewColumn.Two);
+}
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index 33e2b34a2..f36c4b040 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -1,3 +1,4 @@
+import * as analyzerStatus from './analyzer_status';
 import * as applySourceChange from './apply_source_change';
 import * as extendSelection from './extend_selection';
 import * as joinLines from './join_lines';
@@ -8,6 +9,7 @@ import * as runnables from './runnables';
 import * as syntaxTree from './syntaxTree';
 
 export {
+    analyzerStatus,
     applySourceChange,
     extendSelection,
     joinLines,
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts
index 0098c9454..288a852aa 100644
--- a/editors/code/src/extension.ts
+++ b/editors/code/src/extension.ts
@@ -45,6 +45,7 @@ export function activate(context: vscode.ExtensionContext) {
     }
 
     // Commands are requests from vscode to the language server
+    registerCommand('ra-lsp.analyzerStatus', commands.analyzerStatus.handle);
     registerCommand('ra-lsp.syntaxTree', commands.syntaxTree.handle);
     registerCommand('ra-lsp.extendSelection', commands.extendSelection.handle);
     registerCommand('ra-lsp.matchingBrace', commands.matchingBrace.handle);