From 47c501bcfbd24356009d1db5b4dbe2e27a148d9a Mon Sep 17 00:00:00 2001
From: Sergey Parilin <Sergey.Parilin@fxdd.com>
Date: Fri, 22 Mar 2019 13:29:58 +0300
Subject: [PATCH] Move folding_ranges to ra_ide_api
---
.../{ra_ide_api_light => ra_ide_api}/src/folding_ranges.rs | 2 +-
crates/ra_ide_api/src/lib.rs | 6 ++++--
crates/ra_ide_api_light/src/lib.rs | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
rename crates/{ra_ide_api_light => ra_ide_api}/src/folding_ranges.rs (99%)
diff --git a/crates/ra_ide_api_light/src/folding_ranges.rs b/crates/ra_ide_api/src/folding_ranges.rs
similarity index 99%
rename from crates/ra_ide_api_light/src/folding_ranges.rs
rename to crates/ra_ide_api/src/folding_ranges.rs
index 357a7dee1e9..b96145f0517 100644
--- a/crates/ra_ide_api_light/src/folding_ranges.rs
+++ b/crates/ra_ide_api/src/folding_ranges.rs
@@ -20,7 +20,7 @@ pub struct Fold {
pub kind: FoldKind,
}
-pub fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
+pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
let mut res = vec![];
let mut visited_comments = FxHashSet::default();
let mut visited_imports = FxHashSet::default();
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 35f38fbb7b8..d6f63490dc2 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -34,6 +34,7 @@ mod assists;
mod diagnostics;
mod syntax_tree;
mod line_index;
+mod folding_ranges;
mod line_index_utils;
#[cfg(test)]
@@ -64,9 +65,10 @@ pub use crate::{
hover::{HoverResult},
line_index::{LineIndex, LineCol},
line_index_utils::translate_offset_with_edit,
+ folding_ranges::{Fold, FoldKind},
};
pub use ra_ide_api_light::{
- Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit,
+ HighlightedRange, Severity, StructureNode, LocalEdit,
};
pub use ra_db::{
Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId,
@@ -314,7 +316,7 @@ impl Analysis {
/// Returns the set of folding ranges.
pub fn folding_ranges(&self, file_id: FileId) -> Vec<Fold> {
let file = self.db.parse(file_id);
- ra_ide_api_light::folding_ranges(&file)
+ folding_ranges::folding_ranges(&file)
}
/// Fuzzy searches for a symbol.
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs
index 556d44c2594..4036a598e51 100644
--- a/crates/ra_ide_api_light/src/lib.rs
+++ b/crates/ra_ide_api_light/src/lib.rs
@@ -3,7 +3,6 @@
//! This usually means functions which take syntax tree as an input and produce
//! an edit or some auxiliary info.
-mod folding_ranges;
mod structure;
#[cfg(test)]
mod test_utils;
@@ -20,7 +19,6 @@ use ra_syntax::{
};
pub use crate::{
- folding_ranges::{folding_ranges, Fold, FoldKind},
structure::{file_structure, StructureNode},
join_lines::join_lines,
typing::{on_enter, on_dot_typed, on_eq_typed},