Merge branch 'master' into feature/themes

4 files changed, 41 insertions, 12 deletions

diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index 30bcbd7a8..eea0965ed 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -38,7 +38,7 @@ pub fn server_capabilities() -> ServerCapabilities {
         document_range_formatting_provider: None,
         document_on_type_formatting_provider: Some(DocumentOnTypeFormattingOptions {
             first_trigger_character: "=".to_string(),
-            more_trigger_character: Some(vec![".".to_string()]),
+            more_trigger_character: Some(vec![".".to_string(), ">".to_string()]),
         }),
         selection_range_provider: Some(GenericCapability::default()),
         folding_range_provider: Some(FoldingRangeProviderCapability::Simple(true)),
diff --git a/crates/ra_lsp_server/src/config.rs b/crates/ra_lsp_server/src/config.rs
index 579d4c692..9871a3b37 100644
--- a/crates/ra_lsp_server/src/config.rs
+++ b/crates/ra_lsp_server/src/config.rs
@@ -1,4 +1,11 @@
-//! FIXME: write short doc here
+//! Config used by the language server.
+//!
+//! We currently get this config from `initialize` LSP request, which is not the
+//! best way to do it, but was the simplest thing we could implement.
+//!
+//! Of particular interest is the `feature_flags` hash map: while other fields
+//! configure the server itself, feature flags are passed into analysis, and
+//! tweak things like automatic insertion of `()` in completions.
 
 use rustc_hash::FxHashMap;
 
@@ -72,10 +79,7 @@ mod test {
         assert_eq!(default, serde_json::from_str(r#"{}"#).unwrap());
         assert_eq!(
             default,
-            serde_json::from_str(
-                r#"{"publishDecorations":null, "showWorkspaceLoaded":null, "lruCapacity":null}"#
-            )
-            .unwrap()
+            serde_json::from_str(r#"{"publishDecorations":null, "lruCapacity":null}"#).unwrap()
         );
     }
 }
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 1a87706fe..379dab438 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -196,7 +196,7 @@ pub fn main_loop(
     task_receiver.into_iter().for_each(|task| {
         on_task(task, &connection.sender, &mut loop_state.pending_requests, &mut world_state)
     });
-    libdata_receiver.into_iter().for_each(|lib| drop(lib));
+    libdata_receiver.into_iter().for_each(drop);
     log::info!("...tasks have finished");
     log::info!("joining threadpool...");
     drop(pool);
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index a29971d10..20f9aee13 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -27,6 +27,7 @@ use crate::{
 };
 
 pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
+    let _p = profile("handle_analyzer_status");
     let mut buf = world.status();
     writeln!(buf, "\n\nrequests:").unwrap();
     let requests = world.latest_requests.read();
@@ -38,6 +39,7 @@ pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
 }
 
 pub fn handle_syntax_tree(world: WorldSnapshot, params: req::SyntaxTreeParams) -> Result<String> {
+    let _p = profile("handle_syntax_tree");
     let id = params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(id)?;
     let text_range = params.range.map(|p| p.conv_with(&line_index));
@@ -132,6 +134,7 @@ pub fn handle_on_enter(
     }
 }
 
+// Don't forget to add new trigger characters to `ServerCapabilities` in `caps.rs`.
 pub fn handle_on_type_formatting(
     world: WorldSnapshot,
     params: req::DocumentOnTypeFormattingParams,
@@ -144,12 +147,17 @@ pub fn handle_on_type_formatting(
     // in `ra_ide_api`, the `on_type` invariant is that
     // `text.char_at(position) == typed_char`.
     position.offset = position.offset - TextUnit::of_char('.');
+    let char_typed = params.ch.chars().next().unwrap_or('\0');
 
-    let edit = match params.ch.as_str() {
-        "=" => world.analysis().on_eq_typed(position),
-        "." => world.analysis().on_dot_typed(position),
-        _ => return Ok(None),
-    }?;
+    // We have an assist that inserts ` ` after typing `->` in `fn foo() ->{`,
+    // but it requires precise cursor positioning to work, and one can't
+    // position the cursor with on_type formatting. So, let's just toggle this
+    // feature off here, hoping that we'll enable it one day, 😿.
+    if char_typed == '>' {
+        return Ok(None);
+    }
+
+    let edit = world.analysis().on_char_typed(position, char_typed)?;
     let mut edit = match edit {
         Some(it) => it,
         None => return Ok(None),
@@ -166,6 +174,7 @@ pub fn handle_document_symbol(
     world: WorldSnapshot,
     params: req::DocumentSymbolParams,
 ) -> Result<Option<req::DocumentSymbolResponse>> {
+    let _p = profile("handle_document_symbol");
     let file_id = params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(file_id)?;
 
@@ -204,6 +213,7 @@ pub fn handle_workspace_symbol(
     world: WorldSnapshot,
     params: req::WorkspaceSymbolParams,
 ) -> Result<Option<Vec<SymbolInformation>>> {
+    let _p = profile("handle_workspace_symbol");
     let all_symbols = params.query.contains('#');
     let libs = params.query.contains('*');
     let query = {
@@ -247,6 +257,7 @@ pub fn handle_goto_definition(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<req::GotoDefinitionResponse>> {
+    let _p = profile("handle_goto_definition");
     let position = params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_definition(position)? {
         None => return Ok(None),
@@ -260,6 +271,7 @@ pub fn handle_goto_implementation(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<req::GotoImplementationResponse>> {
+    let _p = profile("handle_goto_implementation");
     let position = params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_implementation(position)? {
         None => return Ok(None),
@@ -273,6 +285,7 @@ pub fn handle_goto_type_definition(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<req::GotoTypeDefinitionResponse>> {
+    let _p = profile("handle_goto_type_definition");
     let position = params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_type_definition(position)? {
         None => return Ok(None),
@@ -286,6 +299,7 @@ pub fn handle_parent_module(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Vec<Location>> {
+    let _p = profile("handle_parent_module");
     let position = params.try_conv_with(&world)?;
     world.analysis().parent_module(position)?.iter().try_conv_with_to_vec(&world)
 }
@@ -294,6 +308,7 @@ pub fn handle_runnables(
     world: WorldSnapshot,
     params: req::RunnablesParams,
 ) -> Result<Vec<req::Runnable>> {
+    let _p = profile("handle_runnables");
     let file_id = params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(file_id)?;
     let offset = params.position.map(|it| it.conv_with(&line_index));
@@ -335,6 +350,7 @@ pub fn handle_decorations(
     world: WorldSnapshot,
     params: TextDocumentIdentifier,
 ) -> Result<Vec<Decoration>> {
+    let _p = profile("handle_decorations");
     let file_id = params.try_conv_with(&world)?;
     highlight(&world, file_id)
 }
@@ -383,6 +399,7 @@ pub fn handle_folding_range(
     world: WorldSnapshot,
     params: FoldingRangeParams,
 ) -> Result<Option<Vec<FoldingRange>>> {
+    let _p = profile("handle_folding_range");
     let file_id = params.text_document.try_conv_with(&world)?;
     let folds = world.analysis().folding_ranges(file_id)?;
     let text = world.analysis().file_text(file_id)?;
@@ -400,6 +417,7 @@ pub fn handle_signature_help(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<req::SignatureHelp>> {
+    let _p = profile("handle_signature_help");
     let position = params.try_conv_with(&world)?;
     if let Some(call_info) = world.analysis().call_info(position)? {
         let active_parameter = call_info.active_parameter.map(|it| it as i64);
@@ -419,6 +437,7 @@ pub fn handle_hover(
     world: WorldSnapshot,
     params: req::TextDocumentPositionParams,
 ) -> Result<Option<Hover>> {
+    let _p = profile("handle_hover");
     let position = params.try_conv_with(&world)?;
     let info = match world.analysis().hover(position)? {
         None => return Ok(None),
@@ -517,6 +536,7 @@ pub fn handle_formatting(
     world: WorldSnapshot,
     params: DocumentFormattingParams,
 ) -> Result<Option<Vec<TextEdit>>> {
+    let _p = profile("handle_formatting");
     let file_id = params.text_document.try_conv_with(&world)?;
     let file = world.analysis().file_text(file_id)?;
 
@@ -639,6 +659,7 @@ pub fn handle_code_lens(
     world: WorldSnapshot,
     params: req::CodeLensParams,
 ) -> Result<Option<Vec<CodeLens>>> {
+    let _p = profile("handle_code_lens");
     let file_id = params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(file_id)?;
 
@@ -699,6 +720,7 @@ enum CodeLensResolveData {
 }
 
 pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Result<CodeLens> {
+    let _p = profile("handle_code_lens_resolve");
     let data = code_lens.data.unwrap();
     let resolve = serde_json::from_value(data)?;
     match resolve {
@@ -770,6 +792,7 @@ pub fn publish_diagnostics(
     world: &WorldSnapshot,
     file_id: FileId,
 ) -> Result<req::PublishDiagnosticsParams> {
+    let _p = profile("publish_diagnostics");
     let uri = world.file_id_to_uri(file_id)?;
     let line_index = world.analysis().file_line_index(file_id)?;
     let diagnostics = world
@@ -792,6 +815,7 @@ pub fn publish_decorations(
     world: &WorldSnapshot,
     file_id: FileId,
 ) -> Result<req::PublishDecorationsParams> {
+    let _p = profile("publish_decorations");
     let uri = world.file_id_to_uri(file_id)?;
     Ok(req::PublishDecorationsParams { uri, decorations: highlight(&world, file_id)? })
 }
@@ -841,6 +865,7 @@ pub fn handle_inlay_hints(
     world: WorldSnapshot,
     params: InlayHintsParams,
 ) -> Result<Vec<InlayHint>> {
+    let _p = profile("handle_inlay_hints");
     let file_id = params.text_document.try_conv_with(&world)?;
     let analysis = world.analysis();
     let line_index = analysis.file_line_index(file_id)?;