From cf214ac4e76413bdfd2676edf834505306edc9c6 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 27 May 2019 14:20:11 +0300 Subject: enable profiling in tests --- crates/ra_lsp_server/tests/heavy_tests/main.rs | 70 ++++++++++++++++++++++- crates/ra_lsp_server/tests/heavy_tests/support.rs | 14 +++++ 2 files changed, 83 insertions(+), 1 deletion(-) (limited to 'crates/ra_lsp_server') diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 6f37a980d..3c2dc08ed 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs @@ -6,10 +6,11 @@ use std::{ }; use lsp_types::{ - CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range, + CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range, DidOpenTextDocumentParams, TextDocumentItem, TextDocumentPositionParams }; use ra_lsp_server::req::{ CodeActionParams, CodeActionRequest, Formatting, Runnables, RunnablesParams, CompletionParams, Completion, + DidOpenTextDocument, OnEnter, }; use serde_json::json; use tempfile::TempDir; @@ -17,6 +18,7 @@ use tempfile::TempDir; use crate::support::{project, Project}; const LOG: &'static str = ""; +const PROFILE: &'static str = "*@3>100"; #[test] fn completes_items_from_standard_library() { @@ -341,3 +343,69 @@ fn main() {{}} json!([]), ); } + +#[test] +fn diagnostics_dont_block_typing() { + let librs: String = (0..10).map(|i| format!("mod m{};", i)).collect(); + let libs: String = (0..10).map(|i| format!("//- src/m{}.rs\nfn foo() {{}}\n\n", i)).collect(); + let server = project(&format!( + r#" +//- Cargo.toml +[package] +name = "foo" +version = "0.0.0" + +//- src/lib.rs +{} + +{} + +fn main() {{}} +"#, + librs, libs + )); + server.wait_until_workspace_is_loaded(); + eprintln!("workspace loaded"); + for i in 0..10 { + server.notification::(DidOpenTextDocumentParams { + text_document: TextDocumentItem { + uri: server.doc_id(&format!("src/m{}.rs", i)).uri, + language_id: "rust".to_string(), + version: 0, + text: "/// Docs\nfn foo() {}".to_string(), + }, + }); + } + eprintln!("docs opened"); + let start = std::time::Instant::now(); + server.request::( + TextDocumentPositionParams { + text_document: server.doc_id("src/m0.rs"), + position: Position { line: 0, character: 5 }, + }, + json!({ + "cursorPosition": { + "position": { "character": 4, "line": 1 }, + "textDocument": { "uri": "file:///[..]src/m0.rs" } + }, + "label": "on enter", + "workspaceEdit": { + "documentChanges": [ + { + "edits": [ + { + "newText": "\n/// ", + "range": { + "end": { "character": 5, "line": 0 }, + "start": { "character": 5, "line": 0 } + } + } + ], + "textDocument": { "uri": "file:///[..]src/m0.rs", "version": null } + } + ] + } + }), + ); + eprintln!("handled: {:?}", start.elapsed()); +} diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index d68182174..729067395 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs @@ -52,6 +52,11 @@ impl<'a> Project<'a> { static INIT: Once = Once::new(); INIT.call_once(|| { let _ = Logger::with_env_or_str(crate::LOG).start().unwrap(); + ra_prof::set_filter(if crate::PROFILE.is_empty() { + ra_prof::Filter::disabled() + } else { + ra_prof::Filter::from_spec(&crate::PROFILE) + }); }); let mut paths = vec![]; @@ -121,6 +126,15 @@ impl Server { TextDocumentIdentifier { uri: Url::from_file_path(path).unwrap() } } + pub fn notification(&self, params: N::Params) + where + N: Notification, + N::Params: Serialize, + { + let r = RawNotification::new::(¶ms); + self.send_notification(r) + } + pub fn request(&self, params: R::Params, expected_resp: Value) where R: Request, -- cgit v1.2.3 From a2845bb1f59e5f3d9f41012ace70037b783468ce Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 27 May 2019 14:41:14 +0300 Subject: check cancellation when expanding macros --- crates/ra_lsp_server/tests/heavy_tests/main.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'crates/ra_lsp_server') diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 3c2dc08ed..f61048aaf 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs @@ -365,7 +365,6 @@ fn main() {{}} librs, libs )); server.wait_until_workspace_is_loaded(); - eprintln!("workspace loaded"); for i in 0..10 { server.notification::(DidOpenTextDocumentParams { text_document: TextDocumentItem { @@ -376,7 +375,6 @@ fn main() {{}} }, }); } - eprintln!("docs opened"); let start = std::time::Instant::now(); server.request::( TextDocumentPositionParams { @@ -407,5 +405,6 @@ fn main() {{}} } }), ); - eprintln!("handled: {:?}", start.elapsed()); + let elapsed = start.elapsed(); + assert!(elapsed.as_millis() < 2000, "typing enter took {:?}", elapsed); } -- cgit v1.2.3