Refactor formatting code out of ra_ida_api_light into ra_fmt.

4 files changed, 5 insertions, 79 deletions

diff --git a/crates/ra_ide_api_light/src/formatting.rs b/crates/ra_ide_api_light/src/formatting.rs
deleted file mode 100644
index 8bc03f974..000000000
--- a/crates/ra_ide_api_light/src/formatting.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use itertools::Itertools;
-use ra_syntax::{
-    AstNode,
-    SyntaxNode, SyntaxKind::*,
-    ast::{self, AstToken},
-    algo::generate,
-};
-
-pub fn reindent(text: &str, indent: &str) -> String {
-    let indent = format!("\n{}", indent);
-    text.lines().intersperse(&indent).collect()
-}
-
-/// If the node is on the beginning of the line, calculate indent.
-pub fn leading_indent(node: &SyntaxNode) -> Option<&str> {
-    for leaf in prev_leaves(node) {
-        if let Some(ws) = ast::Whitespace::cast(leaf) {
-            let ws_text = ws.text();
-            if let Some(pos) = ws_text.rfind('\n') {
-                return Some(&ws_text[pos + 1..]);
-            }
-        }
-        if leaf.leaf_text().unwrap().contains('\n') {
-            break;
-        }
-    }
-    None
-}
-
-fn prev_leaves(node: &SyntaxNode) -> impl Iterator<Item = &SyntaxNode> {
-    generate(prev_leaf(node), |&node| prev_leaf(node))
-}
-
-fn prev_leaf(node: &SyntaxNode) -> Option<&SyntaxNode> {
-    generate(node.ancestors().find_map(SyntaxNode::prev_sibling), |it| it.last_child()).last()
-}
-
-pub fn extract_trivial_expression(block: &ast::Block) -> Option<&ast::Expr> {
-    let expr = block.expr()?;
-    if expr.syntax().text().contains('\n') {
-        return None;
-    }
-    let non_trivial_children = block.syntax().children().filter(|it| match it.kind() {
-        WHITESPACE | L_CURLY | R_CURLY => false,
-        _ => it != &expr.syntax(),
-    });
-    if non_trivial_children.count() > 0 {
-        return None;
-    }
-    Some(expr)
-}
-
-pub(crate) fn compute_ws(left: &SyntaxNode, right: &SyntaxNode) -> &'static str {
-    match left.kind() {
-        L_PAREN | L_BRACK => return "",
-        L_CURLY => {
-            if let USE_TREE = right.kind() {
-                return "";
-            }
-        }
-        _ => (),
-    }
-    match right.kind() {
-        R_PAREN | R_BRACK => return "",
-        R_CURLY => {
-            if let USE_TREE = left.kind() {
-                return "";
-            }
-        }
-        DOT => return "",
-        _ => (),
-    }
-    " "
-}
diff --git a/crates/ra_ide_api_light/src/join_lines.rs b/crates/ra_ide_api_light/src/join_lines.rs
index 03770c52e..970afd327 100644
--- a/crates/ra_ide_api_light/src/join_lines.rs
+++ b/crates/ra_ide_api_light/src/join_lines.rs
@@ -5,10 +5,11 @@ use ra_syntax::{
     algo::find_covering_node,
     ast,
 };
-
+use ra_fmt::{
+    compute_ws, extract_trivial_expression
+};
 use crate::{
     LocalEdit, TextEditBuilder,
-    formatting::{compute_ws, extract_trivial_expression},
 };
 
 pub fn join_lines(file: &SourceFile, range: TextRange) -> LocalEdit {
diff --git a/crates/ra_ide_api_light/src/lib.rs b/crates/ra_ide_api_light/src/lib.rs
index f3078f51e..6d1ce8dbf 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.
 
-pub mod formatting;
 mod extend_selection;
 mod folding_ranges;
 mod line_index;
diff --git a/crates/ra_ide_api_light/src/typing.rs b/crates/ra_ide_api_light/src/typing.rs
index a08a5a8c5..9dd9f1c1d 100644
--- a/crates/ra_ide_api_light/src/typing.rs
+++ b/crates/ra_ide_api_light/src/typing.rs
@@ -4,8 +4,8 @@ use ra_syntax::{
     algo::{find_node_at_offset, find_leaf_at_offset, LeafAtOffset},
     ast::{self, AstToken},
 };
-
-use crate::{LocalEdit, TextEditBuilder, formatting::leading_indent};
+use ra_fmt::leading_indent;
+use crate::{LocalEdit, TextEditBuilder};
 
 pub fn on_enter(file: &SourceFile, offset: TextUnit) -> Option<LocalEdit> {
     let comment =