From 952f3856822d471cf5062e82f544c901c385f3ae Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Thu, 3 Sep 2020 12:36:16 +0200
Subject: Impl make::blank_line

---
 crates/assists/src/utils.rs            |  2 +-
 crates/assists/src/utils/insert_use.rs | 33 ++++++++-------------------------
 crates/syntax/src/ast/make.rs          | 12 +++++++++++-
 3 files changed, 20 insertions(+), 27 deletions(-)

(limited to 'crates')

diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs
index daa7b64f7..07afa64ff 100644
--- a/crates/assists/src/utils.rs
+++ b/crates/assists/src/utils.rs
@@ -16,7 +16,7 @@ use syntax::{
 
 use crate::assist_config::SnippetCap;
 
-pub(crate) use insert_use::{find_insert_use_container, insert_use_statement};
+pub(crate) use insert_use::{find_insert_use_container, insert_use, MergeBehaviour};
 
 pub(crate) fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
     extract_trivial_expression(&block)
diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs
index 8842068e6..030a5a935 100644
--- a/crates/assists/src/utils/insert_use.rs
+++ b/crates/assists/src/utils/insert_use.rs
@@ -9,13 +9,12 @@ use syntax::{
     Direction, InsertPosition, SyntaxElement, SyntaxNode, T,
 };
 
-use crate::assist_context::AssistContext;
 use test_utils::mark;
 
 /// Determines the containing syntax node in which to insert a `use` statement affecting `position`.
 pub(crate) fn find_insert_use_container(
     position: &SyntaxNode,
-    ctx: &AssistContext,
+    ctx: &crate::assist_context::AssistContext,
 ) -> Option<Either<ast::ItemList, ast::SourceFile>> {
     ctx.sema.ancestors_with_macros(position.clone()).find_map(|n| {
         if let Some(module) = ast::Module::cast(n.clone()) {
@@ -25,19 +24,9 @@ pub(crate) fn find_insert_use_container(
     })
 }
 
-pub(crate) fn insert_use_statement(
-    // Ideally the position of the cursor, used to
-    position: &SyntaxNode,
-    path_to_import: &str,
-    ctx: &crate::assist_context::AssistContext,
-    builder: &mut text_edit::TextEditBuilder,
-) {
-    insert_use(position.clone(), make::path_from_text(path_to_import), Some(MergeBehaviour::Full));
-}
-
 /// Insert an import path into the given file/node. A `merge` value of none indicates that no import merging is allowed to occur.
 pub fn insert_use(
-    where_: SyntaxNode,
+    where_: &SyntaxNode,
     path: ast::Path,
     merge: Option<MergeBehaviour>,
 ) -> SyntaxNode {
@@ -49,24 +38,21 @@ pub fn insert_use(
                 let to_delete: SyntaxElement = existing_use.syntax().clone().into();
                 let to_delete = to_delete.clone()..=to_delete;
                 let to_insert = iter::once(merged.syntax().clone().into());
-                return algo::replace_children(&where_, to_delete, to_insert);
+                return algo::replace_children(where_, to_delete, to_insert);
             }
         }
     }
 
     // either we weren't allowed to merge or there is no import that fits the merge conditions
     // so look for the place we have to insert to
-    let (insert_position, add_blank) = find_insert_position(&where_, path);
+    let (insert_position, add_blank) = find_insert_position(where_, path);
 
     let to_insert: Vec<SyntaxElement> = {
         let mut buf = Vec::new();
 
         match add_blank {
             AddBlankLine::Before => buf.push(make::tokens::single_newline().into()),
-            AddBlankLine::BeforeTwice => {
-                buf.push(make::tokens::single_newline().into());
-                buf.push(make::tokens::single_newline().into());
-            }
+            AddBlankLine::BeforeTwice => buf.push(make::tokens::blank_line().into()),
             _ => (),
         }
 
@@ -74,17 +60,14 @@ pub fn insert_use(
 
         match add_blank {
             AddBlankLine::After => buf.push(make::tokens::single_newline().into()),
-            AddBlankLine::AfterTwice => {
-                buf.push(make::tokens::single_newline().into());
-                buf.push(make::tokens::single_newline().into());
-            }
+            AddBlankLine::AfterTwice => buf.push(make::tokens::blank_line().into()),
             _ => (),
         }
 
         buf
     };
 
-    algo::insert_children(&where_, insert_position, to_insert)
+    algo::insert_children(where_, insert_position, to_insert)
 }
 
 fn try_merge_imports(
@@ -613,7 +596,7 @@ use foo::bar;",
             .find_map(ast::Path::cast)
             .unwrap();
 
-        let result = insert_use(file, path, mb).to_string();
+        let result = insert_use(&file, path, mb).to_string();
         assert_eq_text!(&result, ra_fixture_after);
     }
 
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index c2c938ad1..33f1ad7b3 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -339,7 +339,7 @@ pub mod tokens {
     use crate::{ast, AstNode, Parse, SourceFile, SyntaxKind::*, SyntaxToken};
 
     pub(super) static SOURCE_FILE: Lazy<Parse<SourceFile>> =
-        Lazy::new(|| SourceFile::parse("const C: <()>::Item = (1 != 1, 2 == 2, !true)\n;"));
+        Lazy::new(|| SourceFile::parse("const C: <()>::Item = (1 != 1, 2 == 2, !true)\n;\n\n"));
 
     pub fn single_space() -> SyntaxToken {
         SOURCE_FILE
@@ -379,6 +379,16 @@ pub mod tokens {
             .unwrap()
     }
 
+    pub fn blank_line() -> SyntaxToken {
+        SOURCE_FILE
+            .tree()
+            .syntax()
+            .descendants_with_tokens()
+            .filter_map(|it| it.into_token())
+            .find(|it| it.kind() == WHITESPACE && it.text().as_str() == "\n\n")
+            .unwrap()
+    }
+
     pub struct WsBuilder(SourceFile);
 
     impl WsBuilder {
-- 
cgit v1.2.3