Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-27 20:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

line_index and line_index_utils moved to ra_ide_api

Browse source
This commit is contained in:
Sergey Parilin 2019-03-22 15:24:43 +03:00
parent 2a6544f906
commit fda70badf8
6 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -1005,6 +1005,7 @@ dependencies = [
"join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"proptest 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ra_assists 0.1.0", "ra_assists 0.1.0",
"ra_db 0.1.0", "ra_db 0.1.0",
"ra_hir 0.1.0", "ra_hir 0.1.0",
@ -1014,6 +1015,7 @@ dependencies = [
"rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"test_utils 0.1.0", "test_utils 0.1.0",
"unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
crates/ra_ide_api/Cargo.toml
View file

@ -14,6 +14,7 @@ fst = "0.3.1"
rustc-hash = "1.0" rustc-hash = "1.0"
parking_lot = "0.7.0" parking_lot = "0.7.0"
unicase = "2.2.0" unicase = "2.2.0"
superslice = "1.0.0"
jemallocator = { version = "0.1.9", optional = true } jemallocator = { version = "0.1.9", optional = true }
jemalloc-ctl = { version = "0.2.0", optional = true } jemalloc-ctl = { version = "0.2.0", optional = true }
@ -28,6 +29,7 @@ ra_assists = { path = "../ra_assists" }
[dev-dependencies] [dev-dependencies]
insta = "0.7.0" insta = "0.7.0"
proptest = "0.9.0"
[features] [features]
jemalloc = [ "jemallocator", "jemalloc-ctl" ] jemalloc = [ "jemallocator", "jemalloc-ctl" ]

5
crates/ra_ide_api/src/lib.rs
View file

@ -33,6 +33,8 @@ mod impls;
mod assists; mod assists;
mod diagnostics; mod diagnostics;
mod syntax_tree; mod syntax_tree;
mod line_index;
mod line_index_utils;
#[cfg(test)] #[cfg(test)]
mod marks; mod marks;
@ -60,10 +62,11 @@ pub use crate::{
references::ReferenceSearchResult, references::ReferenceSearchResult,
assists::{Assist, AssistId}, assists::{Assist, AssistId},
hover::{HoverResult}, hover::{HoverResult},
line_index::{LineIndex, LineCol},
line_index_utils::translate_offset_with_edit,
}; };
pub use ra_ide_api_light::{ pub use ra_ide_api_light::{
Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit, Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit,
LineIndex, LineCol, translate_offset_with_edit,
}; };
pub use ra_db::{ pub use ra_db::{
Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId, Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId,

0
crates/ra_ide_api_light/src/line_index.rs → crates/ra_ide_api/src/line_index.rs
View file

0
crates/ra_ide_api_light/src/line_index_utils.rs → crates/ra_ide_api/src/line_index_utils.rs
View file

4
crates/ra_ide_api_light/src/lib.rs
View file

@ -4,8 +4,6 @@
//! an edit or some auxiliary info. //! an edit or some auxiliary info.
mod folding_ranges; mod folding_ranges;
mod line_index;
mod line_index_utils;
mod structure; mod structure;
#[cfg(test)] #[cfg(test)]
mod test_utils; mod test_utils;
@ -23,8 +21,6 @@ use ra_syntax::{
pub use crate::{ pub use crate::{
folding_ranges::{folding_ranges, Fold, FoldKind}, folding_ranges::{folding_ranges, Fold, FoldKind},
line_index::{LineCol, LineIndex},
line_index_utils::translate_offset_with_edit,
structure::{file_structure, StructureNode}, structure::{file_structure, StructureNode},
join_lines::join_lines, join_lines::join_lines,
typing::{on_enter, on_dot_typed, on_eq_typed}, typing::{on_enter, on_dot_typed, on_eq_typed},