auto_import: use ra_fmt

Author: eulerdisk

crates/ra_assists/src/auto_import.rs

@@ -5,42 +5,6 @@ use ra_syntax::{
 };
 use crate::assist_ctx::{AssistCtx, Assist, AssistBuilder};
 
-// TODO: refactor this before merge
-mod formatting {
-    use ra_syntax::{
-        AstNode, SyntaxNode,
-        ast::{self, AstToken},
-        algo::generate,
-};
-
-    /// 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()
-    }
-}
-
 fn collect_path_segments(path: &ast::Path) -> Option<Vec<&ast::PathSegment>> {
     let mut v = Vec::new();
     collect_path_segments_raw(&mut v, path)?;
@@ -461,7 +425,7 @@ fn make_assist_add_new_use(
     edit: &mut AssistBuilder,
 ) {
     if let Some(anchor) = anchor {
-        let indent = formatting::leading_indent(anchor);
+        let indent = ra_fmt::leading_indent(anchor);
         let mut buf = String::new();
         if after {
             buf.push_str("\n");