2 files changed, 30 insertions, 13 deletions

diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index 6e9f2d0fc..497f887cd 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -1,12 +1,11 @@
 use hir::{EnumVariant, Module, ModuleDef, Name};
 use ra_db::FileId;
-use ra_fmt::leading_indent;
 use ra_ide_db::{defs::Definition, search::Reference, RootDatabase};
 use rustc_hash::FxHashSet;
 use syntax::{
     algo::find_node_at_offset,
-    ast::{self, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
-    SourceFile, SyntaxNode, TextRange, TextSize,
+    ast::{self, edit::IndentLevel, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
+    SourceFile, TextRange, TextSize,
 };
 
 use crate::{
@@ -72,7 +71,7 @@ pub(crate) fn extract_struct_from_enum_variant(
             }
             extract_struct_def(
                 builder,
-                enum_ast.syntax(),
+                &enum_ast,
                 &variant_name,
                 &field_list.to_string(),
                 start_offset,
@@ -112,9 +111,10 @@ fn insert_import(
     Some(())
 }
 
+// FIXME: this should use strongly-typed `make`, rather than string manipulation.
 fn extract_struct_def(
     builder: &mut AssistBuilder,
-    enum_ast: &SyntaxNode,
+    enum_: &ast::Enum,
     variant_name: &str,
     variant_list: &str,
     start_offset: TextSize,
@@ -126,11 +126,7 @@ fn extract_struct_def(
     } else {
         "".to_string()
     };
-    let indent = if let Some(indent) = leading_indent(enum_ast) {
-        indent.to_string()
-    } else {
-        "".to_string()
-    };
+    let indent = IndentLevel::from_node(enum_.syntax());
     let struct_def = format!(
         r#"{}struct {}{};
 
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
index f89c288da..50a62ee82 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/ra_assists/src/utils/insert_use.rs
@@ -2,13 +2,15 @@
 // FIXME: rewrite according to the plan, outlined in
 // https://github.com/rust-analyzer/rust-analyzer/issues/3301#issuecomment-592931553
 
+use std::iter::successors;
+
 use either::Either;
 use hir::{self, ModPath};
 use syntax::{
     ast::{self, NameOwner, VisibilityOwner},
-    AstNode, Direction, SmolStr,
+    AstNode, AstToken, Direction, SmolStr,
     SyntaxKind::{PATH, PATH_SEGMENT},
-    SyntaxNode, T,
+    SyntaxNode, SyntaxToken, T,
 };
 use text_edit::TextEditBuilder;
 
@@ -442,7 +444,7 @@ fn make_assist_add_new_use(
     edit: &mut TextEditBuilder,
 ) {
     if let Some(anchor) = anchor {
-        let indent = ra_fmt::leading_indent(anchor);
+        let indent = leading_indent(anchor);
         let mut buf = String::new();
         if after {
             buf.push_str("\n");
@@ -524,3 +526,22 @@ fn make_assist_add_nested_import(
         edit.insert(end, "}".to_string());
     }
 }
+
+/// If the node is on the beginning of the line, calculate indent.
+fn leading_indent(node: &SyntaxNode) -> Option<SmolStr> {
+    for token in prev_tokens(node.first_token()?) {
+        if let Some(ws) = ast::Whitespace::cast(token.clone()) {
+            let ws_text = ws.text();
+            if let Some(pos) = ws_text.rfind('\n') {
+                return Some(ws_text[pos + 1..].into());
+            }
+        }
+        if token.text().contains('\n') {
+            break;
+        }
+    }
+    return None;
+    fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> {
+        successors(token.prev_token(), |token| token.prev_token())
+    }
+}