aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/main_loop.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-06-24 17:58:44 +0100
committerGitHub <[email protected]>2020-06-24 17:58:44 +0100
commitbff7307b8c4cc8577ea2a58b8438afc70aab2bea (patch)
tree0e49ad954b8b6d48e580be802c60f889a76aeb98 /crates/rust-analyzer/src/main_loop.rs
parent946b2c28a7099071bb799b1c1ee29fb609289c44 (diff)
parent693489e5ee2aad1aab342c099457eb060035e8c3 (diff)
Merge #5039
5039: Flatten module hierarchy r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r--crates/rust-analyzer/src/main_loop.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index b55d45cd3..c8819c3b0 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -1,9 +1,5 @@
1//! The main loop of `rust-analyzer` responsible for dispatching LSP 1//! The main loop of `rust-analyzer` responsible for dispatching LSP
2//! requests/replies and notifications back to the client. 2//! requests/replies and notifications back to the client.
3
4mod handlers;
5pub(crate) mod request_metrics;
6
7use std::{ 3use std::{
8 env, 4 env,
9 error::Error, 5 error::Error,
@@ -19,6 +15,7 @@ use lsp_server::{
19 Connection, ErrorCode, Message, Notification, ReqQueue, Request, RequestId, Response, 15 Connection, ErrorCode, Message, Notification, ReqQueue, Request, RequestId, Response,
20}; 16};
21use lsp_types::{request::Request as _, NumberOrString, TextDocumentContentChangeEvent}; 17use lsp_types::{request::Request as _, NumberOrString, TextDocumentContentChangeEvent};
18use ra_db::VfsPath;
22use ra_flycheck::CheckTask; 19use ra_flycheck::CheckTask;
23use ra_ide::{Canceled, FileId, LineIndex}; 20use ra_ide::{Canceled, FileId, LineIndex};
24use ra_prof::profile; 21use ra_prof::profile;
@@ -32,11 +29,10 @@ use crate::{
32 diagnostics::DiagnosticTask, 29 diagnostics::DiagnosticTask,
33 from_proto, 30 from_proto,
34 global_state::{file_id_to_url, GlobalState, GlobalStateSnapshot}, 31 global_state::{file_id_to_url, GlobalState, GlobalStateSnapshot},
35 lsp_ext, 32 handlers, lsp_ext,
36 main_loop::request_metrics::RequestMetrics, 33 request_metrics::RequestMetrics,
37 Result, 34 Result,
38}; 35};
39use ra_db::VfsPath;
40 36
41#[derive(Debug)] 37#[derive(Debug)]
42pub struct LspError { 38pub struct LspError {