rust/crates/ide/src/join_lines.rs

847 lines
17 KiB
Rust
Raw Normal View History

use ide_assists::utils::extract_trivial_expression;
2019-01-10 08:50:49 -06:00
use itertools::Itertools;
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-15 11:15:33 -06:00
algo::non_trivia_sibling,
2019-04-02 02:23:18 -05:00
ast::{self, AstNode, AstToken},
2019-07-20 12:04:34 -05:00
Direction, NodeOrToken, SourceFile,
2020-08-13 04:44:39 -05:00
SyntaxKind::{self, USE_TREE, WHITESPACE},
2020-04-24 16:40:41 -05:00
SyntaxNode, SyntaxToken, TextRange, TextSize, T,
};
2021-03-08 14:19:44 -06:00
2020-08-12 10:03:06 -05:00
use text_edit::{TextEdit, TextEditBuilder};
2019-01-10 08:50:49 -06:00
// Feature: Join Lines
//
// Join selected lines into one, smartly fixing up whitespace, trailing commas, and braces.
//
// |===
// | Editor | Action Name
//
// | VS Code | **Rust Analyzer: Join lines**
// |===
//
// image::https://user-images.githubusercontent.com/48062697/113020661-b6922200-917a-11eb-87c4-b75acc028f11.gif[]
2020-11-02 09:31:38 -06:00
pub(crate) fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
2019-03-22 11:10:20 -05:00
let range = if range.is_empty() {
2019-01-10 08:50:49 -06:00
let syntax = file.syntax();
2019-03-22 11:10:20 -05:00
let text = syntax.text().slice(range.start()..);
2019-07-20 08:52:11 -05:00
let pos = match text.find_char('\n') {
2020-08-12 09:58:56 -05:00
None => return TextEdit::builder().finish(),
2019-01-10 08:50:49 -06:00
Some(pos) => pos,
};
2020-04-24 16:40:41 -05:00
TextRange::at(range.start() + pos, TextSize::of('\n'))
2019-01-10 08:50:49 -06:00
} else {
2019-03-22 11:10:20 -05:00
range
2019-01-10 08:50:49 -06:00
};
2020-08-12 09:58:56 -05:00
let mut edit = TextEdit::builder();
match file.syntax().covering_element(range) {
NodeOrToken::Node(node) => {
for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) {
remove_newlines(&mut edit, &token, range)
2019-01-10 08:50:49 -06:00
}
}
NodeOrToken::Token(token) => remove_newlines(&mut edit, &token, range),
};
2019-03-21 15:42:22 -05:00
edit.finish()
2019-01-10 08:50:49 -06:00
}
fn remove_newlines(edit: &mut TextEditBuilder, token: &SyntaxToken, range: TextRange) {
let intersection = match range.intersect(token.text_range()) {
Some(range) => range,
None => return,
};
let range = intersection - token.text_range().start();
let text = token.text();
for (pos, _) in text[range].bytes().enumerate().filter(|&(_, b)| b == b'\n') {
let pos: TextSize = (pos as u32).into();
let offset = token.text_range().start() + range.start() + pos;
if !edit.invalidates_offset(offset) {
remove_newline(edit, &token, offset);
}
}
}
2020-04-24 16:40:41 -05:00
fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextSize) {
2019-03-30 05:25:53 -05:00
if token.kind() != WHITESPACE || token.text().bytes().filter(|&b| b == b'\n').count() != 1 {
let mut string_open_quote = false;
if let Some(string) = ast::String::cast(token.clone()) {
if let Some(range) = string.open_quote_text_range() {
2021-03-08 14:19:44 -06:00
cov_mark::hit!(join_string_literal);
string_open_quote = range.end() == offset;
}
}
let n_spaces_after_line_break = {
let suff = &token.text()[TextRange::new(
offset - token.text_range().start() + TextSize::of('\n'),
TextSize::of(token.text()),
)];
suff.bytes().take_while(|&b| b == b' ').count()
};
let range = TextRange::at(offset, ((n_spaces_after_line_break + 1) as u32).into());
let replace_with = if string_open_quote { "" } else { " " };
edit.replace(range, replace_with.to_string());
2019-01-10 08:50:49 -06:00
return;
}
// The node is between two other nodes
let (prev, next) = match (token.prev_sibling_or_token(), token.next_sibling_or_token()) {
(Some(prev), Some(next)) => (prev, next),
_ => return,
};
2019-01-10 08:50:49 -06:00
if is_trailing_comma(prev.kind(), next.kind()) {
// Removes: trailing comma, newline (incl. surrounding whitespace)
2020-04-24 16:40:41 -05:00
edit.delete(TextRange::new(prev.text_range().start(), token.text_range().end()));
2020-02-11 11:36:12 -06:00
return;
}
if prev.kind() == T![,] && next.kind() == T!['}'] {
2019-01-10 08:50:49 -06:00
// Removes: comma, newline (incl. surrounding whitespace)
2019-03-30 05:25:53 -05:00
let space = if let Some(left) = prev.prev_sibling_or_token() {
compute_ws(left.kind(), next.kind())
} else {
" "
};
2019-01-10 08:50:49 -06:00
edit.replace(
2020-04-24 16:40:41 -05:00
TextRange::new(prev.text_range().start(), token.text_range().end()),
2019-01-10 08:50:49 -06:00
space.to_string(),
);
2020-02-11 11:36:12 -06:00
return;
}
if let (Some(_), Some(next)) = (
2019-07-19 04:56:47 -05:00
prev.as_token().cloned().and_then(ast::Comment::cast),
next.as_token().cloned().and_then(ast::Comment::cast),
) {
2019-01-10 08:50:49 -06:00
// Removes: newline (incl. surrounding whitespace), start of the next comment
2020-04-24 16:40:41 -05:00
edit.delete(TextRange::new(
2019-07-20 04:58:27 -05:00
token.text_range().start(),
2020-04-24 16:40:41 -05:00
next.syntax().text_range().start() + TextSize::of(next.prefix()),
2019-01-10 08:50:49 -06:00
));
2020-02-11 11:36:12 -06:00
return;
}
2020-02-11 11:33:25 -06:00
2020-02-11 11:36:12 -06:00
// Special case that turns something like:
//
// ```
2021-01-06 14:15:48 -06:00
// my_function({$0
2020-02-11 11:36:12 -06:00
// <some-expr>
// })
// ```
//
// into `my_function(<some-expr>)`
if join_single_expr_block(edit, token).is_some() {
return;
2019-01-10 08:50:49 -06:00
}
2020-02-11 11:36:12 -06:00
// ditto for
//
// ```
2021-01-06 14:15:48 -06:00
// use foo::{$0
2020-02-11 11:36:12 -06:00
// bar
// };
// ```
if join_single_use_tree(edit, token).is_some() {
return;
}
// Remove newline but add a computed amount of whitespace characters
edit.replace(token.text_range(), compute_ws(prev.kind(), next.kind()).to_string());
2019-01-10 08:50:49 -06:00
}
fn has_comma_after(node: &SyntaxNode) -> bool {
2019-07-19 04:56:47 -05:00
match non_trivia_sibling(node.clone().into(), Direction::Next) {
2019-05-15 07:35:47 -05:00
Some(n) => n.kind() == T![,],
_ => false,
}
}
2019-07-19 04:56:47 -05:00
fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
let block_expr = ast::BlockExpr::cast(token.parent()?)?;
if !block_expr.is_standalone() {
return None;
}
2019-09-02 13:23:19 -05:00
let expr = extract_trivial_expression(&block_expr)?;
2019-07-20 04:58:27 -05:00
let block_range = block_expr.syntax().text_range();
let mut buf = expr.syntax().text().to_string();
// Match block needs to have a comma after the block
if let Some(match_arm) = block_expr.syntax().parent().and_then(ast::MatchArm::cast) {
if !has_comma_after(match_arm.syntax()) {
buf.push(',');
}
}
edit.replace(block_range, buf);
2019-01-10 08:50:49 -06:00
Some(())
}
2019-07-19 04:56:47 -05:00
fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
let use_tree_list = ast::UseTreeList::cast(token.parent()?)?;
2019-01-10 08:50:49 -06:00
let (tree,) = use_tree_list.use_trees().collect_tuple()?;
2019-07-20 04:58:27 -05:00
edit.replace(use_tree_list.syntax().text_range(), tree.syntax().text().to_string());
2019-01-10 08:50:49 -06:00
Some(())
}
fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
2020-06-27 20:02:03 -05:00
matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
2019-01-10 08:50:49 -06:00
}
2020-08-13 04:44:39 -05:00
fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
match left {
T!['('] | T!['['] => return "",
T!['{'] => {
if let USE_TREE = right {
return "";
}
}
_ => (),
}
match right {
T![')'] | T![']'] => return "",
T!['}'] => {
if let USE_TREE = left {
return "";
}
}
T![.] => return "",
_ => (),
}
" "
}
2019-01-10 08:50:49 -06:00
#[cfg(test)]
mod tests {
2020-08-12 11:26:51 -05:00
use syntax::SourceFile;
2021-03-08 14:19:44 -06:00
use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range};
2019-01-10 08:50:49 -06:00
use super::*;
2021-01-07 09:21:00 -06:00
fn check_join_lines(ra_fixture_before: &str, ra_fixture_after: &str) {
let (before_cursor_pos, before) = extract_offset(ra_fixture_before);
2020-05-21 09:11:37 -05:00
let file = SourceFile::parse(&before).ok().unwrap();
let range = TextRange::empty(before_cursor_pos);
let result = join_lines(&file, range);
let actual = {
let mut actual = before;
2020-05-21 09:11:37 -05:00
result.apply(&mut actual);
actual
};
let actual_cursor_pos = result
.apply_to_offset(before_cursor_pos)
.expect("cursor position is affected by the edit");
let actual = add_cursor(&actual, actual_cursor_pos);
2021-01-07 09:21:00 -06:00
assert_eq_text!(ra_fixture_after, &actual);
2019-01-10 08:50:49 -06:00
}
#[test]
fn test_join_lines_comma() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0foo(1,
2019-01-10 08:50:49 -06:00
)
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0foo(1)
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_lambda_block() {
check_join_lines(
r"
pub fn reparse(&self, edit: &AtomTextEdit) -> File {
2021-01-06 14:15:48 -06:00
$0self.incremental_reparse(edit).unwrap_or_else(|| {
2019-01-10 08:50:49 -06:00
self.full_reparse(edit)
})
}
",
r"
pub fn reparse(&self, edit: &AtomTextEdit) -> File {
2021-01-06 14:15:48 -06:00
$0self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_block() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
foo($0{
2019-01-10 08:50:49 -06:00
92
})
}",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
foo($092)
2019-01-10 08:50:49 -06:00
}",
);
}
#[test]
fn test_join_lines_diverging_block() {
2021-02-09 08:48:25 -06:00
check_join_lines(
r"
fn foo() {
loop {
match x {
92 => $0{
continue;
}
2021-02-09 08:48:25 -06:00
}
}
}
",
r"
fn foo() {
loop {
match x {
92 => $0continue,
}
}
}
",
);
}
2019-02-21 05:06:21 -06:00
#[test]
fn join_lines_adds_comma_for_block_in_match_arm() {
check_join_lines(
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0{
2019-02-21 05:06:21 -06:00
u.foo()
}
Err(v) => v,
}
}",
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0u.foo(),
2019-02-21 05:06:21 -06:00
Err(v) => v,
}
}",
);
}
#[test]
fn join_lines_multiline_in_block() {
check_join_lines(
r"
fn foo() {
match ty {
2021-01-06 14:15:48 -06:00
$0 Some(ty) => {
match ty {
_ => false,
}
}
_ => true,
}
}
",
r"
fn foo() {
match ty {
2021-01-06 14:15:48 -06:00
$0 Some(ty) => match ty {
_ => false,
},
_ => true,
}
}
",
);
}
#[test]
fn join_lines_keeps_comma_for_block_in_match_arm() {
// We already have a comma
check_join_lines(
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0{
u.foo()
},
Err(v) => v,
}
}",
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0u.foo(),
Err(v) => v,
}
}",
);
// comma with whitespace between brace and ,
check_join_lines(
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0{
u.foo()
} ,
Err(v) => v,
}
}",
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0u.foo() ,
Err(v) => v,
}
}",
);
// comma with newline between brace and ,
check_join_lines(
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0{
u.foo()
}
,
Err(v) => v,
}
}",
r"
fn foo(e: Result<U, V>) {
match e {
2021-01-06 14:15:48 -06:00
Ok(u) => $0u.foo()
,
Err(v) => v,
}
}",
);
}
#[test]
fn join_lines_keeps_comma_with_single_arg_tuple() {
// A single arg tuple
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($0{
4
},);
}",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($04,);
}",
);
// single arg tuple with whitespace between brace and comma
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($0{
4
} ,);
}",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($04 ,);
}",
);
// single arg tuple with newline between brace and comma
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($0{
4
}
,);
}",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
let x = ($04
,);
}",
);
}
2019-01-10 08:50:49 -06:00
#[test]
fn test_join_lines_use_items_left() {
// No space after the '{'
check_join_lines(
r"
2021-01-06 14:15:48 -06:00
$0use syntax::{
2020-04-24 16:40:41 -05:00
TextSize, TextRange,
2019-01-10 08:50:49 -06:00
};",
r"
2021-01-06 14:15:48 -06:00
$0use syntax::{TextSize, TextRange,
2019-01-10 08:50:49 -06:00
};",
);
}
#[test]
fn test_join_lines_use_items_right() {
// No space after the '}'
check_join_lines(
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
$0 TextSize, TextRange
2019-01-10 08:50:49 -06:00
};",
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
$0 TextSize, TextRange};",
2019-01-10 08:50:49 -06:00
);
}
#[test]
fn test_join_lines_use_items_right_comma() {
// No space after the '}'
check_join_lines(
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
$0 TextSize, TextRange,
2019-01-10 08:50:49 -06:00
};",
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
$0 TextSize, TextRange};",
2019-01-10 08:50:49 -06:00
);
}
#[test]
fn test_join_lines_use_tree() {
check_join_lines(
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
algo::$0{
2019-03-30 05:25:53 -05:00
find_token_at_offset,
2019-01-10 08:50:49 -06:00
},
ast,
};",
r"
2020-08-12 11:26:51 -05:00
use syntax::{
2021-01-06 14:15:48 -06:00
algo::$0find_token_at_offset,
2019-01-10 08:50:49 -06:00
ast,
};",
);
}
#[test]
fn test_join_lines_normal_comments() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// Hello$0
2019-01-10 08:50:49 -06:00
// world!
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// Hello$0 world!
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_doc_comments() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
/// Hello$0
2019-01-10 08:50:49 -06:00
/// world!
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
/// Hello$0 world!
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_mod_comments() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
//! Hello$0
2019-01-10 08:50:49 -06:00
//! world!
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
//! Hello$0 world!
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_multiline_comments_1() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// Hello$0
2019-01-10 08:50:49 -06:00
/* world! */
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// Hello$0 world! */
2019-01-10 08:50:49 -06:00
}
",
);
}
#[test]
fn test_join_lines_multiline_comments_2() {
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// The$0
2019-01-10 08:50:49 -06:00
/* quick
brown
fox! */
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
// The$0 quick
2019-01-10 08:50:49 -06:00
brown
fox! */
}
",
);
}
2021-01-07 09:21:00 -06:00
fn check_join_lines_sel(ra_fixture_before: &str, ra_fixture_after: &str) {
let (sel, before) = extract_range(ra_fixture_before);
let parse = SourceFile::parse(&before);
2019-07-19 04:56:47 -05:00
let result = join_lines(&parse.tree(), sel);
2020-05-05 16:48:26 -05:00
let actual = {
let mut actual = before;
2020-05-05 16:48:26 -05:00
result.apply(&mut actual);
actual
};
2021-01-07 09:21:00 -06:00
assert_eq_text!(ra_fixture_after, &actual);
2019-01-10 08:50:49 -06:00
}
#[test]
fn test_join_lines_selection_fn_args() {
check_join_lines_sel(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0foo(1,
2019-01-10 08:50:49 -06:00
2,
3,
2021-01-06 14:15:48 -06:00
$0)
2019-01-10 08:50:49 -06:00
}
",
r"
fn foo() {
foo(1, 2, 3)
}
",
);
}
#[test]
fn test_join_lines_selection_struct() {
check_join_lines_sel(
r"
2021-01-06 14:15:48 -06:00
struct Foo $0{
2019-01-10 08:50:49 -06:00
f: u32,
2021-01-06 14:15:48 -06:00
}$0
2019-01-10 08:50:49 -06:00
",
r"
struct Foo { f: u32 }
",
);
}
#[test]
fn test_join_lines_selection_dot_chain() {
check_join_lines_sel(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
join($0type_params.type_params()
2019-01-10 08:50:49 -06:00
.filter_map(|it| it.name())
2021-01-06 14:15:48 -06:00
.map(|it| it.text())$0)
2019-01-10 08:50:49 -06:00
}",
r"
fn foo() {
join(type_params.type_params().filter_map(|it| it.name()).map(|it| it.text()))
}",
);
}
#[test]
fn test_join_lines_selection_lambda_block_body() {
check_join_lines_sel(
r"
pub fn handle_find_matching_brace() {
params.offsets
2021-01-06 14:15:48 -06:00
.map(|offset| $0{
2019-01-10 08:50:49 -06:00
world.analysis().matching_brace(&file, offset).unwrap_or(offset)
2021-01-06 14:15:48 -06:00
}$0)
2019-01-10 08:50:49 -06:00
.collect();
}",
r"
pub fn handle_find_matching_brace() {
params.offsets
.map(|offset| world.analysis().matching_brace(&file, offset).unwrap_or(offset))
.collect();
}",
);
}
2020-02-11 11:33:25 -06:00
#[test]
fn test_join_lines_commented_block() {
check_join_lines(
r"
fn main() {
let _ = {
2021-01-06 14:15:48 -06:00
// $0foo
2020-02-11 11:33:25 -06:00
// bar
92
};
}
",
r"
fn main() {
let _ = {
2021-01-06 14:15:48 -06:00
// $0foo bar
2020-02-11 11:33:25 -06:00
92
};
}
",
)
}
#[test]
fn join_lines_mandatory_blocks_block() {
check_join_lines(
r"
2021-01-06 14:15:48 -06:00
$0fn foo() {
92
}
",
r"
2021-01-06 14:15:48 -06:00
$0fn foo() { 92
}
",
);
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0if true {
92
}
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0if true { 92
}
}
",
);
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0loop {
92
}
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0loop { 92
}
}
",
);
check_join_lines(
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0unsafe {
92
}
}
",
r"
fn foo() {
2021-01-06 14:15:48 -06:00
$0unsafe { 92
}
}
",
);
}
#[test]
fn join_string_literal() {
2021-03-08 14:19:44 -06:00
cov_mark::check!(join_string_literal);
check_join_lines(
r#"
fn main() {
$0"
hello
";
}
"#,
r#"
fn main() {
$0"hello
";
}
"#,
);
check_join_lines(
r#"
fn main() {
"
$0hello
world
";
}
"#,
r#"
fn main() {
"
$0hello world
";
}
"#,
);
}
#[test]
fn join_last_line_empty() {
check_join_lines(
r#"
fn main() {$0}
"#,
r#"
fn main() {$0}
"#,
);
}
2019-01-10 08:50:49 -06:00
}