diff options
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/src/caps.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/conv.rs | 3 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs index 560f64989..5f7038f63 100644 --- a/crates/ra_lsp_server/src/caps.rs +++ b/crates/ra_lsp_server/src/caps.rs | |||
@@ -19,7 +19,7 @@ pub fn server_capabilities() -> ServerCapabilities { | |||
19 | hover_provider: Some(true), | 19 | hover_provider: Some(true), |
20 | completion_provider: Some(CompletionOptions { | 20 | completion_provider: Some(CompletionOptions { |
21 | resolve_provider: None, | 21 | resolve_provider: None, |
22 | trigger_characters: Some(vec![":".to_string()]), | 22 | trigger_characters: Some(vec![":".to_string(), ".".to_string()]), |
23 | }), | 23 | }), |
24 | signature_help_provider: Some(SignatureHelpOptions { | 24 | signature_help_provider: Some(SignatureHelpOptions { |
25 | trigger_characters: Some(vec!["(".to_string(), ",".to_string(), ")".to_string()]), | 25 | trigger_characters: Some(vec!["(".to_string(), ",".to_string(), ")".to_string()]), |
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs index 5a911d9d2..d3670104e 100644 --- a/crates/ra_lsp_server/src/conv.rs +++ b/crates/ra_lsp_server/src/conv.rs | |||
@@ -55,7 +55,10 @@ impl Conv for CompletionItemKind { | |||
55 | CompletionItemKind::Snippet => Snippet, | 55 | CompletionItemKind::Snippet => Snippet, |
56 | CompletionItemKind::Module => Module, | 56 | CompletionItemKind::Module => Module, |
57 | CompletionItemKind::Function => Function, | 57 | CompletionItemKind::Function => Function, |
58 | CompletionItemKind::Struct => Struct, | ||
59 | CompletionItemKind::Enum => Enum, | ||
58 | CompletionItemKind::Binding => Variable, | 60 | CompletionItemKind::Binding => Variable, |
61 | CompletionItemKind::Field => Field, | ||
59 | } | 62 | } |
60 | } | 63 | } |
61 | } | 64 | } |
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 60f13267c..1edb9fae4 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -427,7 +427,7 @@ impl<'a> PoolDispatcher<'a> { | |||
427 | RawResponse::err( | 427 | RawResponse::err( |
428 | id, | 428 | id, |
429 | ErrorCode::ContentModified as i32, | 429 | ErrorCode::ContentModified as i32, |
430 | format!("content modified: {}", e), | 430 | format!("content modified: {:?}", e), |
431 | ) | 431 | ) |
432 | } else { | 432 | } else { |
433 | RawResponse::err( | 433 | RawResponse::err( |
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 029a55d40..1f5cc5e8b 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
@@ -141,7 +141,7 @@ fn main() {} | |||
141 | server.request::<CodeActionRequest>( | 141 | server.request::<CodeActionRequest>( |
142 | CodeActionParams { | 142 | CodeActionParams { |
143 | text_document: server.doc_id("src/lib.rs"), | 143 | text_document: server.doc_id("src/lib.rs"), |
144 | range: Range::new(Position::new(0, 0), Position::new(0, 7)), | 144 | range: Range::new(Position::new(0, 4), Position::new(0, 7)), |
145 | context: empty_context(), | 145 | context: empty_context(), |
146 | }, | 146 | }, |
147 | json!([ | 147 | json!([ |
@@ -168,7 +168,7 @@ fn main() {} | |||
168 | server.request::<CodeActionRequest>( | 168 | server.request::<CodeActionRequest>( |
169 | CodeActionParams { | 169 | CodeActionParams { |
170 | text_document: server.doc_id("src/lib.rs"), | 170 | text_document: server.doc_id("src/lib.rs"), |
171 | range: Range::new(Position::new(2, 0), Position::new(2, 7)), | 171 | range: Range::new(Position::new(2, 4), Position::new(2, 7)), |
172 | context: empty_context(), | 172 | context: empty_context(), |
173 | }, | 173 | }, |
174 | json!([]), | 174 | json!([]), |