diff options
author | Aleksey Kladov <[email protected]> | 2019-07-04 21:05:17 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-07-04 21:09:09 +0100 |
commit | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch) | |
tree | 92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_lsp_server/tests | |
parent | 2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff) |
allow rustfmt to reorder imports
This wasn't a right decision in the first place, the feature flag was
broken in the last rustfmt release, and syntax highlighting of imports
is more important anyway
Diffstat (limited to 'crates/ra_lsp_server/tests')
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 12 | ||||
-rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 9 |
2 files changed, 8 insertions, 13 deletions
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 40d825893..d271b02fc 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
@@ -1,16 +1,14 @@ | |||
1 | mod support; | 1 | mod support; |
2 | 2 | ||
3 | use std::{ | 3 | use std::{collections::HashMap, time::Instant}; |
4 | collections::HashMap, | ||
5 | time::Instant, | ||
6 | }; | ||
7 | 4 | ||
8 | use lsp_types::{ | 5 | use lsp_types::{ |
9 | CodeActionContext, DocumentFormattingParams, FormattingOptions, Position, Range, DidOpenTextDocumentParams, TextDocumentItem, TextDocumentPositionParams | 6 | CodeActionContext, DidOpenTextDocumentParams, DocumentFormattingParams, FormattingOptions, |
7 | Position, Range, TextDocumentItem, TextDocumentPositionParams, | ||
10 | }; | 8 | }; |
11 | use ra_lsp_server::req::{ | 9 | use ra_lsp_server::req::{ |
12 | CodeActionParams, CodeActionRequest, Formatting, Runnables, RunnablesParams, CompletionParams, Completion, | 10 | CodeActionParams, CodeActionRequest, Completion, CompletionParams, DidOpenTextDocument, |
13 | DidOpenTextDocument, OnEnter, | 11 | Formatting, OnEnter, Runnables, RunnablesParams, |
14 | }; | 12 | }; |
15 | use serde_json::json; | 13 | use serde_json::json; |
16 | use tempfile::TempDir; | 14 | use tempfile::TempDir; |
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index 75912afdd..a5e352da1 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs | |||
@@ -11,20 +11,17 @@ use flexi_logger::Logger; | |||
11 | use gen_lsp_server::{RawMessage, RawNotification, RawRequest}; | 11 | use gen_lsp_server::{RawMessage, RawNotification, RawRequest}; |
12 | use lsp_types::{ | 12 | use lsp_types::{ |
13 | notification::DidOpenTextDocument, | 13 | notification::DidOpenTextDocument, |
14 | notification::{Notification, ShowMessage}, | ||
14 | request::{Request, Shutdown}, | 15 | request::{Request, Shutdown}, |
15 | DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, | 16 | DidOpenTextDocumentParams, TextDocumentIdentifier, TextDocumentItem, Url, |
16 | notification::{Notification, ShowMessage}, | ||
17 | }; | 17 | }; |
18 | use serde::Serialize; | 18 | use serde::Serialize; |
19 | use serde_json::{to_string_pretty, Value}; | 19 | use serde_json::{to_string_pretty, Value}; |
20 | use tempfile::TempDir; | 20 | use tempfile::TempDir; |
21 | use test_utils::{find_mismatch, parse_fixture}; | ||
21 | use thread_worker::Worker; | 22 | use thread_worker::Worker; |
22 | use test_utils::{parse_fixture, find_mismatch}; | ||
23 | 23 | ||
24 | use ra_lsp_server::{ | 24 | use ra_lsp_server::{main_loop, req, InitializationOptions}; |
25 | main_loop, req, | ||
26 | InitializationOptions, | ||
27 | }; | ||
28 | 25 | ||
29 | pub struct Project<'a> { | 26 | pub struct Project<'a> { |
30 | fixture: &'a str, | 27 | fixture: &'a str, |