diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-07 06:26:09 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-07 06:26:09 +0000 |
commit | a6071c9f4c8441b4b8f2e970bc055d66cc9be5f0 (patch) | |
tree | 67fb82094ed6542f77f4ad1cc8b7bdbfb37bf6b1 /crates/ra_lsp_server/src/main_loop.rs | |
parent | c69bb8a7e737e09c667f9e343d0f1d3e4c13b8f7 (diff) | |
parent | f3c708ab7babc4e94250cbfbaae0fdd3919284ce (diff) |
Merge #442
442: WIP: indent on typing dot r=matklad a=simonvandel
Fixes #439.
The unit test passes, but I can't seem to make VS code perform the action. The existing action on "=" doesn't work either on my end either though.
I didn't add any smart way of detecting the current indent level. Any ideas how I would do that?
Co-authored-by: Simon Vandel Sillesen <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop.rs')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 60d9671de..2dc1be26a 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -1,13 +1,11 @@ | |||
1 | mod handlers; | 1 | mod handlers; |
2 | mod subscriptions; | 2 | mod subscriptions; |
3 | 3 | ||
4 | use std::{ | 4 | use std::{fmt, path::PathBuf, sync::Arc}; |
5 | fmt, | ||
6 | path::PathBuf, | ||
7 | sync::Arc, | ||
8 | }; | ||
9 | 5 | ||
10 | use crossbeam_channel::{unbounded, select, Receiver, Sender, RecvError}; | 6 | use crossbeam_channel::{select, unbounded, Receiver, RecvError, Sender}; |
7 | use failure::{bail, format_err}; | ||
8 | use failure_derive::Fail; | ||
11 | use gen_lsp_server::{ | 9 | use gen_lsp_server::{ |
12 | handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, | 10 | handle_shutdown, ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, |
13 | }; | 11 | }; |
@@ -15,11 +13,9 @@ use languageserver_types::NumberOrString; | |||
15 | use ra_analysis::{Canceled, FileId, LibraryData}; | 13 | use ra_analysis::{Canceled, FileId, LibraryData}; |
16 | use ra_vfs::VfsTask; | 14 | use ra_vfs::VfsTask; |
17 | use rayon; | 15 | use rayon; |
18 | use threadpool::ThreadPool; | ||
19 | use rustc_hash::FxHashSet; | 16 | use rustc_hash::FxHashSet; |
20 | use serde::{de::DeserializeOwned, Serialize}; | 17 | use serde::{de::DeserializeOwned, Serialize}; |
21 | use failure::{format_err, bail}; | 18 | use threadpool::ThreadPool; |
22 | use failure_derive::Fail; | ||
23 | 19 | ||
24 | use crate::{ | 20 | use crate::{ |
25 | main_loop::subscriptions::Subscriptions, | 21 | main_loop::subscriptions::Subscriptions, |