Refactor formatting code out of ra_ida_api_light into ra_fmt.

9 files changed, 23 insertions, 9 deletions

diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index 20bc253e3..71ab2dcd2 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -7,9 +7,9 @@ authors = ["Aleksey Kladov <[email protected]>"]
 [dependencies]
 join_to_string = "0.1.3"
 
-ra_ide_api_light = { path = "../ra_ide_api_light" }
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
+ra_fmt = { path = "../ra_fmt" }
 ra_db = { path = "../ra_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index 0bf640241..7fb11d5f5 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
     SourceFile, TextRange, AstNode, TextUnit, SyntaxNode,
     algo::{find_leaf_at_offset, find_node_at_offset, find_covering_node, LeafAtOffset},
 };
-use ra_ide_api_light::formatting::{leading_indent, reindent};
+use ra_fmt::{leading_indent, reindent};
 
 use crate::{AssistLabel, AssistAction};
 
diff --git a/crates/ra_assists/src/replace_if_let_with_match.rs b/crates/ra_assists/src/replace_if_let_with_match.rs
index 683f0d119..bdac381c2 100644
--- a/crates/ra_assists/src/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/replace_if_let_with_match.rs
@@ -1,5 +1,5 @@
 use ra_syntax::{AstNode, ast};
-use ra_ide_api_light::formatting::extract_trivial_expression;
+use ra_fmt::extract_trivial_expression;
 use hir::db::HirDatabase;
 
 use crate::{AssistCtx, Assist};
diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml
new file mode 100644
index 000000000..1cf1b520f
--- /dev/null
+++ b/crates/ra_fmt/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+edition = "2018"
+name = "ra_fmt"
+version = "0.1.0"
+authors = ["Aleksey Kladov <[email protected]>"]
+publish = false
+
+[dependencies]
+itertools = "0.8.0"
+
+ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_ide_api_light/src/formatting.rs b/crates/ra_fmt/src/lib.rs
index 8bc03f974..62e6fb9c1 100644
--- a/crates/ra_ide_api_light/src/formatting.rs
+++ b/crates/ra_fmt/src/lib.rs
@@ -1,3 +1,5 @@
+//! This crate provides some utilities for indenting rust code.
+//!
 use itertools::Itertools;
 use ra_syntax::{
     AstNode,
@@ -50,7 +52,7 @@ pub fn extract_trivial_expression(block: &ast::Block) -> Option<&ast::Expr> {
     Some(expr)
 }
 
-pub(crate) fn compute_ws(left: &SyntaxNode, right: &SyntaxNode) -> &'static str {
+pub fn compute_ws(left: &SyntaxNode, right: &SyntaxNode) -> &'static str {
     match left.kind() {
         L_PAREN | L_BRACK => return "",
         L_CURLY => {
diff --git a/crates/ra_ide_api_light/Cargo.toml b/crates/ra_ide_api_light/Cargo.toml
index c1e4314ce..86311e677 100644
--- a/crates/ra_ide_api_light/Cargo.toml
+++ b/crates/ra_ide_api_light/Cargo.toml
@@ -13,6 +13,7 @@ rustc-hash = "1.0"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
+ra_fmt = { path = "../ra_fmt" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
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 =