diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_ide_api/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 5 | ||||
-rw-r--r-- | crates/ra_ide_api/src/line_index.rs (renamed from crates/ra_ide_api_light/src/line_index.rs) | 0 | ||||
-rw-r--r-- | crates/ra_ide_api/src/line_index_utils.rs (renamed from crates/ra_ide_api_light/src/line_index_utils.rs) | 0 | ||||
-rw-r--r-- | crates/ra_ide_api_light/src/lib.rs | 4 |
5 files changed, 6 insertions, 5 deletions
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml index 40b7a8d0a..ac8c8057b 100644 --- a/crates/ra_ide_api/Cargo.toml +++ b/crates/ra_ide_api/Cargo.toml | |||
@@ -14,6 +14,7 @@ fst = "0.3.1" | |||
14 | rustc-hash = "1.0" | 14 | rustc-hash = "1.0" |
15 | parking_lot = "0.7.0" | 15 | parking_lot = "0.7.0" |
16 | unicase = "2.2.0" | 16 | unicase = "2.2.0" |
17 | superslice = "1.0.0" | ||
17 | 18 | ||
18 | jemallocator = { version = "0.1.9", optional = true } | 19 | jemallocator = { version = "0.1.9", optional = true } |
19 | jemalloc-ctl = { version = "0.2.0", optional = true } | 20 | jemalloc-ctl = { version = "0.2.0", optional = true } |
@@ -28,6 +29,7 @@ ra_assists = { path = "../ra_assists" } | |||
28 | 29 | ||
29 | [dev-dependencies] | 30 | [dev-dependencies] |
30 | insta = "0.7.0" | 31 | insta = "0.7.0" |
32 | proptest = "0.9.0" | ||
31 | 33 | ||
32 | [features] | 34 | [features] |
33 | jemalloc = [ "jemallocator", "jemalloc-ctl" ] | 35 | jemalloc = [ "jemallocator", "jemalloc-ctl" ] |
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index 81ca57035..35f38fbb7 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
@@ -33,6 +33,8 @@ mod impls; | |||
33 | mod assists; | 33 | mod assists; |
34 | mod diagnostics; | 34 | mod diagnostics; |
35 | mod syntax_tree; | 35 | mod syntax_tree; |
36 | mod line_index; | ||
37 | mod line_index_utils; | ||
36 | 38 | ||
37 | #[cfg(test)] | 39 | #[cfg(test)] |
38 | mod marks; | 40 | mod marks; |
@@ -60,10 +62,11 @@ pub use crate::{ | |||
60 | references::ReferenceSearchResult, | 62 | references::ReferenceSearchResult, |
61 | assists::{Assist, AssistId}, | 63 | assists::{Assist, AssistId}, |
62 | hover::{HoverResult}, | 64 | hover::{HoverResult}, |
65 | line_index::{LineIndex, LineCol}, | ||
66 | line_index_utils::translate_offset_with_edit, | ||
63 | }; | 67 | }; |
64 | pub use ra_ide_api_light::{ | 68 | pub use ra_ide_api_light::{ |
65 | Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit, | 69 | Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit, |
66 | LineIndex, LineCol, translate_offset_with_edit, | ||
67 | }; | 70 | }; |
68 | pub use ra_db::{ | 71 | pub use ra_db::{ |
69 | Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId, | 72 | Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId, |
diff --git a/crates/ra_ide_api_light/src/line_index.rs b/crates/ra_ide_api/src/line_index.rs index bf004c33a..bf004c33a 100644 --- a/crates/ra_ide_api_light/src/line_index.rs +++ b/crates/ra_ide_api/src/line_index.rs | |||
diff --git a/crates/ra_ide_api_light/src/line_index_utils.rs b/crates/ra_ide_api/src/line_index_utils.rs index 799a920ad..799a920ad 100644 --- a/crates/ra_ide_api_light/src/line_index_utils.rs +++ b/crates/ra_ide_api/src/line_index_utils.rs | |||
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs index 47b30255b..556d44c25 100644 --- a/crates/ra_ide_api_light/src/lib.rs +++ b/crates/ra_ide_api_light/src/lib.rs | |||
@@ -4,8 +4,6 @@ | |||
4 | //! an edit or some auxiliary info. | 4 | //! an edit or some auxiliary info. |
5 | 5 | ||
6 | mod folding_ranges; | 6 | mod folding_ranges; |
7 | mod line_index; | ||
8 | mod line_index_utils; | ||
9 | mod structure; | 7 | mod structure; |
10 | #[cfg(test)] | 8 | #[cfg(test)] |
11 | mod test_utils; | 9 | mod test_utils; |
@@ -23,8 +21,6 @@ use ra_syntax::{ | |||
23 | 21 | ||
24 | pub use crate::{ | 22 | pub use crate::{ |
25 | folding_ranges::{folding_ranges, Fold, FoldKind}, | 23 | folding_ranges::{folding_ranges, Fold, FoldKind}, |
26 | line_index::{LineCol, LineIndex}, | ||
27 | line_index_utils::translate_offset_with_edit, | ||
28 | structure::{file_structure, StructureNode}, | 24 | structure::{file_structure, StructureNode}, |
29 | join_lines::join_lines, | 25 | join_lines::join_lines, |
30 | typing::{on_enter, on_dot_typed, on_eq_typed}, | 26 | typing::{on_enter, on_dot_typed, on_eq_typed}, |