aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-06 11:17:40 +0000
committerAleksey Kladov <[email protected]>2020-02-06 11:17:40 +0000
commitee2ee1a8ff7ad13211d2f66d2f2f1daaf3a00bd9 (patch)
treec0956465525077f4318ff6575ec6a3ac24bc57ff
parent551f33d754c5131f548baee4f58fd5892a9c7efc (diff)
Move line_index
-rw-r--r--crates/ra_ide/src/ide_db/line_index.rs (renamed from crates/ra_ide/src/line_index.rs)2
-rw-r--r--crates/ra_ide/src/ide_db/line_index_utils.rs (renamed from crates/ra_ide/src/line_index_utils.rs)3
-rw-r--r--crates/ra_ide/src/ide_db/mod.rs6
-rw-r--r--crates/ra_ide/src/lib.rs8
4 files changed, 12 insertions, 7 deletions
diff --git a/crates/ra_ide/src/line_index.rs b/crates/ra_ide/src/ide_db/line_index.rs
index 710890d27..6f99ca3a7 100644
--- a/crates/ra_ide/src/line_index.rs
+++ b/crates/ra_ide/src/ide_db/line_index.rs
@@ -1,6 +1,6 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use crate::TextUnit; 3use ra_syntax::TextUnit;
4use rustc_hash::FxHashMap; 4use rustc_hash::FxHashMap;
5use superslice::Ext; 5use superslice::Ext;
6 6
diff --git a/crates/ra_ide/src/line_index_utils.rs b/crates/ra_ide/src/ide_db/line_index_utils.rs
index bd1e08feb..70bf7253c 100644
--- a/crates/ra_ide/src/line_index_utils.rs
+++ b/crates/ra_ide/src/ide_db/line_index_utils.rs
@@ -1,9 +1,10 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use crate::{line_index::Utf16Char, LineCol, LineIndex};
4use ra_syntax::{TextRange, TextUnit}; 3use ra_syntax::{TextRange, TextUnit};
5use ra_text_edit::{AtomTextEdit, TextEdit}; 4use ra_text_edit::{AtomTextEdit, TextEdit};
6 5
6use crate::ide_db::line_index::{LineCol, LineIndex, Utf16Char};
7
7#[derive(Debug, Clone)] 8#[derive(Debug, Clone)]
8enum Step { 9enum Step {
9 Newline(TextUnit), 10 Newline(TextUnit),
diff --git a/crates/ra_ide/src/ide_db/mod.rs b/crates/ra_ide/src/ide_db/mod.rs
index 47d0aed6f..cd47132ce 100644
--- a/crates/ra_ide/src/ide_db/mod.rs
+++ b/crates/ra_ide/src/ide_db/mod.rs
@@ -1,5 +1,8 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3pub mod line_index;
4pub mod line_index_utils;
5
3use std::sync::Arc; 6use std::sync::Arc;
4 7
5use ra_db::{ 8use ra_db::{
@@ -10,8 +13,9 @@ use ra_db::{
10use rustc_hash::FxHashMap; 13use rustc_hash::FxHashMap;
11 14
12use crate::{ 15use crate::{
16 ide_db::line_index::LineIndex,
13 symbol_index::{self, SymbolsDatabase}, 17 symbol_index::{self, SymbolsDatabase},
14 FeatureFlags, LineIndex, 18 FeatureFlags,
15}; 19};
16 20
17#[salsa::database( 21#[salsa::database(
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index f10c871b8..00d608269 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -37,8 +37,6 @@ mod assists;
37mod diagnostics; 37mod diagnostics;
38mod syntax_tree; 38mod syntax_tree;
39mod folding_ranges; 39mod folding_ranges;
40mod line_index;
41mod line_index_utils;
42mod join_lines; 40mod join_lines;
43mod typing; 41mod typing;
44mod matching_brace; 42mod matching_brace;
@@ -75,9 +73,11 @@ pub use crate::{
75 feature_flags::FeatureFlags, 73 feature_flags::FeatureFlags,
76 folding_ranges::{Fold, FoldKind}, 74 folding_ranges::{Fold, FoldKind},
77 hover::HoverResult, 75 hover::HoverResult,
76 ide_db::{
77 line_index::{LineCol, LineIndex},
78 line_index_utils::translate_offset_with_edit,
79 },
78 inlay_hints::{InlayHint, InlayKind}, 80 inlay_hints::{InlayHint, InlayKind},
79 line_index::{LineCol, LineIndex},
80 line_index_utils::translate_offset_with_edit,
81 references::{ 81 references::{
82 Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult, SearchScope, 82 Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult, SearchScope,
83 }, 83 },