diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/from_proto.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/global_state.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/handlers.rs | 3 | ||||
-rw-r--r-- | crates/rust-analyzer/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/line_index.rs (renamed from crates/rust-analyzer/src/line_endings.rs) | 3 | ||||
-rw-r--r-- | crates/rust-analyzer/src/lsp_utils.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 425ef145c..9c873c097 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -25,7 +25,7 @@ use vfs::AbsPathBuf; | |||
25 | 25 | ||
26 | use crate::{ | 26 | use crate::{ |
27 | caps::completion_item_edit_resolve, diagnostics::DiagnosticsMapConfig, | 27 | caps::completion_item_edit_resolve, diagnostics::DiagnosticsMapConfig, |
28 | line_endings::OffsetEncoding, lsp_ext::supports_utf8, | 28 | line_index::OffsetEncoding, lsp_ext::supports_utf8, |
29 | }; | 29 | }; |
30 | 30 | ||
31 | config_data! { | 31 | config_data! { |
diff --git a/crates/rust-analyzer/src/from_proto.rs b/crates/rust-analyzer/src/from_proto.rs index 4f3ae8cc3..5b02b2598 100644 --- a/crates/rust-analyzer/src/from_proto.rs +++ b/crates/rust-analyzer/src/from_proto.rs | |||
@@ -9,7 +9,7 @@ use vfs::AbsPathBuf; | |||
9 | use crate::{ | 9 | use crate::{ |
10 | from_json, | 10 | from_json, |
11 | global_state::GlobalStateSnapshot, | 11 | global_state::GlobalStateSnapshot, |
12 | line_endings::{LineIndex, OffsetEncoding}, | 12 | line_index::{LineIndex, OffsetEncoding}, |
13 | lsp_ext, Result, | 13 | lsp_ext, Result, |
14 | }; | 14 | }; |
15 | 15 | ||
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs index 85c87645c..52c249713 100644 --- a/crates/rust-analyzer/src/global_state.rs +++ b/crates/rust-analyzer/src/global_state.rs | |||
@@ -22,7 +22,7 @@ use crate::{ | |||
22 | diagnostics::{CheckFixes, DiagnosticCollection}, | 22 | diagnostics::{CheckFixes, DiagnosticCollection}, |
23 | document::DocumentData, | 23 | document::DocumentData, |
24 | from_proto, | 24 | from_proto, |
25 | line_endings::{LineEndings, LineIndex}, | 25 | line_index::{LineEndings, LineIndex}, |
26 | main_loop::Task, | 26 | main_loop::Task, |
27 | op_queue::OpQueue, | 27 | op_queue::OpQueue, |
28 | reload::SourceRootConfig, | 28 | reload::SourceRootConfig, |
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index d8b00e9c5..4f6f250d6 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs | |||
@@ -36,8 +36,7 @@ use crate::{ | |||
36 | diff::diff, | 36 | diff::diff, |
37 | from_proto, | 37 | from_proto, |
38 | global_state::{GlobalState, GlobalStateSnapshot}, | 38 | global_state::{GlobalState, GlobalStateSnapshot}, |
39 | line_endings::LineEndings, | 39 | line_index::{LineEndings, LineIndex}, |
40 | line_endings::LineIndex, | ||
41 | lsp_ext::{self, InlayHint, InlayHintsParams}, | 40 | lsp_ext::{self, InlayHint, InlayHintsParams}, |
42 | lsp_utils::all_edits_are_disjoint, | 41 | lsp_utils::all_edits_are_disjoint, |
43 | to_proto, LspError, Result, | 42 | to_proto, LspError, Result, |
diff --git a/crates/rust-analyzer/src/lib.rs b/crates/rust-analyzer/src/lib.rs index 2207b9a87..8b874239c 100644 --- a/crates/rust-analyzer/src/lib.rs +++ b/crates/rust-analyzer/src/lib.rs | |||
@@ -29,7 +29,7 @@ mod from_proto; | |||
29 | mod semantic_tokens; | 29 | mod semantic_tokens; |
30 | mod markdown; | 30 | mod markdown; |
31 | mod diagnostics; | 31 | mod diagnostics; |
32 | mod line_endings; | 32 | mod line_index; |
33 | mod request_metrics; | 33 | mod request_metrics; |
34 | mod lsp_utils; | 34 | mod lsp_utils; |
35 | mod thread_pool; | 35 | mod thread_pool; |
diff --git a/crates/rust-analyzer/src/line_endings.rs b/crates/rust-analyzer/src/line_index.rs index dd8901152..c116414da 100644 --- a/crates/rust-analyzer/src/line_endings.rs +++ b/crates/rust-analyzer/src/line_index.rs | |||
@@ -1,3 +1,6 @@ | |||
1 | //! Enhances `ide::LineIndex` with additional info required to convert offsets | ||
2 | //! into lsp positions. | ||
3 | //! | ||
1 | //! We maintain invariant that all internal strings use `\n` as line separator. | 4 | //! We maintain invariant that all internal strings use `\n` as line separator. |
2 | //! This module does line ending conversion and detection (so that we can | 5 | //! This module does line ending conversion and detection (so that we can |
3 | //! convert back to `\r\n` on the way out). | 6 | //! convert back to `\r\n` on the way out). |
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs index 6b8e347b9..84f78b5b8 100644 --- a/crates/rust-analyzer/src/lsp_utils.rs +++ b/crates/rust-analyzer/src/lsp_utils.rs | |||
@@ -7,7 +7,7 @@ use lsp_server::Notification; | |||
7 | use crate::{ | 7 | use crate::{ |
8 | from_proto, | 8 | from_proto, |
9 | global_state::GlobalState, | 9 | global_state::GlobalState, |
10 | line_endings::{LineEndings, LineIndex, OffsetEncoding}, | 10 | line_index::{LineEndings, LineIndex, OffsetEncoding}, |
11 | }; | 11 | }; |
12 | 12 | ||
13 | pub(crate) fn is_canceled(e: &(dyn Error + 'static)) -> bool { | 13 | pub(crate) fn is_canceled(e: &(dyn Error + 'static)) -> bool { |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 368d916e7..6aff65575 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -17,7 +17,7 @@ use serde_json::to_value; | |||
17 | use crate::{ | 17 | use crate::{ |
18 | cargo_target_spec::CargoTargetSpec, | 18 | cargo_target_spec::CargoTargetSpec, |
19 | global_state::GlobalStateSnapshot, | 19 | global_state::GlobalStateSnapshot, |
20 | line_endings::{LineEndings, LineIndex, OffsetEncoding}, | 20 | line_index::{LineEndings, LineIndex, OffsetEncoding}, |
21 | lsp_ext, semantic_tokens, Result, | 21 | lsp_ext, semantic_tokens, Result, |
22 | }; | 22 | }; |
23 | 23 | ||