2018-08-25 05:42:40 -05:00
|
|
|
use std::mem;
|
|
|
|
|
2018-09-16 04:54:24 -05:00
|
|
|
use ra_syntax::{
|
2018-10-15 16:44:23 -05:00
|
|
|
algo::{find_covering_node, find_leaf_at_offset, LeafAtOffset},
|
2018-08-25 05:42:40 -05:00
|
|
|
ast,
|
2018-10-15 16:44:23 -05:00
|
|
|
text_utils::{contains_offset_nonstrict, intersect},
|
|
|
|
AstNode, File, SyntaxKind,
|
2018-08-23 13:38:25 -05:00
|
|
|
SyntaxKind::*,
|
2018-10-15 16:44:23 -05:00
|
|
|
SyntaxNodeRef, TextRange, TextUnit,
|
2018-08-23 12:55:23 -05:00
|
|
|
};
|
|
|
|
|
2018-10-15 16:44:23 -05:00
|
|
|
use crate::{find_node_at_offset, EditBuilder, LocalEdit};
|
2018-08-23 12:55:23 -05:00
|
|
|
|
2018-08-29 10:03:14 -05:00
|
|
|
pub fn join_lines(file: &File, range: TextRange) -> LocalEdit {
|
2018-08-23 12:55:23 -05:00
|
|
|
let range = if range.is_empty() {
|
2018-08-28 06:06:30 -05:00
|
|
|
let syntax = file.syntax();
|
|
|
|
let text = syntax.text().slice(range.start()..);
|
|
|
|
let pos = match text.find('\n') {
|
2018-10-15 16:44:23 -05:00
|
|
|
None => {
|
|
|
|
return LocalEdit {
|
|
|
|
edit: EditBuilder::new().finish(),
|
|
|
|
cursor_position: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(pos) => pos,
|
2018-08-28 06:06:30 -05:00
|
|
|
};
|
2018-10-15 16:44:23 -05:00
|
|
|
TextRange::offset_len(range.start() + pos, TextUnit::of_char('\n'))
|
2018-08-23 12:55:23 -05:00
|
|
|
} else {
|
|
|
|
range
|
|
|
|
};
|
2018-10-10 05:37:06 -05:00
|
|
|
|
2018-08-23 12:55:23 -05:00
|
|
|
let node = find_covering_node(file.syntax(), range);
|
|
|
|
let mut edit = EditBuilder::new();
|
2018-10-02 10:02:57 -05:00
|
|
|
for node in node.descendants() {
|
2018-08-23 12:55:23 -05:00
|
|
|
let text = match node.leaf_text() {
|
|
|
|
Some(text) => text,
|
|
|
|
None => continue,
|
|
|
|
};
|
|
|
|
let range = match intersect(range, node.range()) {
|
|
|
|
Some(range) => range,
|
|
|
|
None => continue,
|
|
|
|
} - node.range().start();
|
|
|
|
for (pos, _) in text[range].bytes().enumerate().filter(|&(_, b)| b == b'\n') {
|
|
|
|
let pos: TextUnit = (pos as u32).into();
|
|
|
|
let off = node.range().start() + range.start() + pos;
|
2018-08-29 10:35:28 -05:00
|
|
|
if !edit.invalidates_offset(off) {
|
|
|
|
remove_newline(&mut edit, node, text.as_str(), off);
|
|
|
|
}
|
2018-08-23 12:55:23 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-29 10:03:14 -05:00
|
|
|
LocalEdit {
|
2018-08-23 12:55:23 -05:00
|
|
|
edit: edit.finish(),
|
|
|
|
cursor_position: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-09 08:00:20 -05:00
|
|
|
pub fn on_enter(file: &File, offset: TextUnit) -> Option<LocalEdit> {
|
2018-10-15 16:44:23 -05:00
|
|
|
let comment = find_leaf_at_offset(file.syntax(), offset)
|
|
|
|
.left_biased()
|
2018-10-17 18:25:37 -05:00
|
|
|
.and_then(ast::Comment::cast)?;
|
2018-10-11 09:25:35 -05:00
|
|
|
|
|
|
|
if let ast::CommentFlavor::Multiline = comment.flavor() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let prefix = comment.prefix();
|
|
|
|
if offset < comment.syntax().range().start() + TextUnit::of_str(prefix) + TextUnit::from(1) {
|
2018-10-09 08:00:20 -05:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2018-10-11 09:25:35 -05:00
|
|
|
let indent = node_indent(file, comment.syntax())?;
|
|
|
|
let inserted = format!("\n{}{} ", indent, prefix);
|
2018-10-09 08:00:20 -05:00
|
|
|
let cursor_position = offset + TextUnit::of_str(&inserted);
|
|
|
|
let mut edit = EditBuilder::new();
|
|
|
|
edit.insert(offset, inserted);
|
|
|
|
Some(LocalEdit {
|
|
|
|
edit: edit.finish(),
|
|
|
|
cursor_position: Some(cursor_position),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
fn node_indent<'a>(file: &'a File, node: SyntaxNodeRef) -> Option<&'a str> {
|
|
|
|
let ws = match find_leaf_at_offset(file.syntax(), node.range().start()) {
|
|
|
|
LeafAtOffset::Between(l, r) => {
|
|
|
|
assert!(r == node);
|
|
|
|
l
|
|
|
|
}
|
|
|
|
LeafAtOffset::Single(n) => {
|
|
|
|
assert!(n == node);
|
2018-10-15 16:44:23 -05:00
|
|
|
return Some("");
|
2018-10-09 08:00:20 -05:00
|
|
|
}
|
|
|
|
LeafAtOffset::None => unreachable!(),
|
|
|
|
};
|
|
|
|
if ws.kind() != WHITESPACE {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
let text = ws.leaf_text().unwrap();
|
|
|
|
let pos = text.as_str().rfind('\n').map(|it| it + 1).unwrap_or(0);
|
|
|
|
Some(&text[pos..])
|
|
|
|
}
|
|
|
|
|
2018-08-29 10:03:14 -05:00
|
|
|
pub fn on_eq_typed(file: &File, offset: TextUnit) -> Option<LocalEdit> {
|
2018-08-28 03:12:42 -05:00
|
|
|
let let_stmt: ast::LetStmt = find_node_at_offset(file.syntax(), offset)?;
|
|
|
|
if let_stmt.has_semi() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
if let Some(expr) = let_stmt.initializer() {
|
|
|
|
let expr_range = expr.syntax().range();
|
|
|
|
if contains_offset_nonstrict(expr_range, offset) && offset != expr_range.start() {
|
|
|
|
return None;
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
if file
|
|
|
|
.syntax()
|
|
|
|
.text()
|
|
|
|
.slice(offset..expr_range.start())
|
|
|
|
.contains('\n')
|
|
|
|
{
|
2018-08-28 13:45:59 -05:00
|
|
|
return None;
|
|
|
|
}
|
2018-08-28 03:17:08 -05:00
|
|
|
} else {
|
|
|
|
return None;
|
2018-08-28 03:12:42 -05:00
|
|
|
}
|
|
|
|
let offset = let_stmt.syntax().range().end();
|
|
|
|
let mut edit = EditBuilder::new();
|
|
|
|
edit.insert(offset, ";".to_string());
|
2018-08-29 10:03:14 -05:00
|
|
|
Some(LocalEdit {
|
2018-08-28 03:12:42 -05:00
|
|
|
edit: edit.finish(),
|
|
|
|
cursor_position: None,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2018-10-15 16:44:23 -05:00
|
|
|
fn remove_newline(edit: &mut EditBuilder, node: SyntaxNodeRef, node_text: &str, offset: TextUnit) {
|
2018-10-11 09:45:52 -05:00
|
|
|
if node.kind() != WHITESPACE || node_text.bytes().filter(|&b| b == b'\n').count() != 1 {
|
|
|
|
// The node is either the first or the last in the file
|
|
|
|
let suff = &node_text[TextRange::from_to(
|
|
|
|
offset - node.range().start() + TextUnit::of_char('\n'),
|
|
|
|
TextUnit::of_str(node_text),
|
|
|
|
)];
|
|
|
|
let spaces = suff.bytes().take_while(|&b| b == b' ').count();
|
2018-10-10 05:37:06 -05:00
|
|
|
|
2018-10-11 09:45:52 -05:00
|
|
|
edit.replace(
|
|
|
|
TextRange::offset_len(offset, ((spaces + 1) as u32).into()),
|
|
|
|
" ".to_string(),
|
|
|
|
);
|
|
|
|
return;
|
|
|
|
}
|
2018-10-10 05:37:06 -05:00
|
|
|
|
2018-10-11 09:45:52 -05:00
|
|
|
// Special case that turns something like:
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// my_function({<|>
|
|
|
|
// <some-expr>
|
|
|
|
// })
|
|
|
|
// ```
|
|
|
|
//
|
|
|
|
// into `my_function(<some-expr>)`
|
|
|
|
if join_single_expr_block(edit, node).is_some() {
|
2018-10-15 16:44:23 -05:00
|
|
|
return;
|
2018-10-11 09:45:52 -05:00
|
|
|
}
|
2018-10-10 05:37:06 -05:00
|
|
|
|
2018-10-11 09:45:52 -05:00
|
|
|
// The node is between two other nodes
|
|
|
|
let prev = node.prev_sibling().unwrap();
|
|
|
|
let next = node.next_sibling().unwrap();
|
|
|
|
if is_trailing_comma(prev.kind(), next.kind()) {
|
|
|
|
// Removes: trailing comma, newline (incl. surrounding whitespace)
|
|
|
|
edit.delete(TextRange::from_to(prev.range().start(), node.range().end()));
|
|
|
|
} else if prev.kind() == COMMA && next.kind() == R_CURLY {
|
|
|
|
// Removes: comma, newline (incl. surrounding whitespace)
|
|
|
|
// Adds: a single whitespace
|
|
|
|
edit.replace(
|
|
|
|
TextRange::from_to(prev.range().start(), node.range().end()),
|
2018-10-15 16:44:23 -05:00
|
|
|
" ".to_string(),
|
2018-10-11 09:45:52 -05:00
|
|
|
);
|
|
|
|
} else if let (Some(_), Some(next)) = (ast::Comment::cast(prev), ast::Comment::cast(next)) {
|
|
|
|
// Removes: newline (incl. surrounding whitespace), start of the next comment
|
2018-10-11 10:16:12 -05:00
|
|
|
edit.delete(TextRange::from_to(
|
|
|
|
node.range().start(),
|
2018-10-15 16:44:23 -05:00
|
|
|
next.syntax().range().start() + TextUnit::of_str(next.prefix()),
|
2018-10-11 10:16:12 -05:00
|
|
|
));
|
2018-10-11 09:45:52 -05:00
|
|
|
} else {
|
|
|
|
// Remove newline but add a computed amount of whitespace characters
|
2018-10-15 16:44:23 -05:00
|
|
|
edit.replace(node.range(), compute_ws(prev, next).to_string());
|
2018-08-23 13:38:25 -05:00
|
|
|
}
|
2018-08-23 12:55:23 -05:00
|
|
|
}
|
2018-08-23 13:38:25 -05:00
|
|
|
|
2018-08-28 14:37:49 -05:00
|
|
|
fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
|
|
|
|
match (left, right) {
|
2018-10-15 16:44:23 -05:00
|
|
|
(COMMA, R_PAREN) | (COMMA, R_BRACK) => true,
|
|
|
|
_ => false,
|
2018-08-28 14:37:49 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-15 16:44:23 -05:00
|
|
|
fn join_single_expr_block(edit: &mut EditBuilder, node: SyntaxNodeRef) -> Option<()> {
|
2018-08-25 05:42:40 -05:00
|
|
|
let block = ast::Block::cast(node.parent()?)?;
|
|
|
|
let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
|
|
|
|
let expr = single_expr(block)?;
|
|
|
|
edit.replace(
|
|
|
|
block_expr.syntax().range(),
|
2018-08-28 06:06:30 -05:00
|
|
|
expr.syntax().text().to_string(),
|
2018-08-25 05:42:40 -05:00
|
|
|
);
|
|
|
|
Some(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn single_expr(block: ast::Block) -> Option<ast::Expr> {
|
|
|
|
let mut res = None;
|
|
|
|
for child in block.syntax().children() {
|
|
|
|
if let Some(expr) = ast::Expr::cast(child) {
|
|
|
|
if expr.syntax().text().contains('\n') {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
if mem::replace(&mut res, Some(expr)).is_some() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
match child.kind() {
|
|
|
|
WHITESPACE | L_CURLY | R_CURLY => (),
|
|
|
|
_ => return None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
res
|
|
|
|
}
|
|
|
|
|
2018-08-23 13:38:25 -05:00
|
|
|
fn compute_ws(left: SyntaxNodeRef, right: SyntaxNodeRef) -> &'static str {
|
|
|
|
match left.kind() {
|
|
|
|
L_PAREN | L_BRACK => return "",
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
match right.kind() {
|
|
|
|
R_PAREN | R_BRACK => return "",
|
2018-10-11 09:45:52 -05:00
|
|
|
DOT => return "",
|
2018-08-23 13:38:25 -05:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
" "
|
|
|
|
}
|
2018-08-28 06:47:12 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
2018-10-15 16:44:23 -05:00
|
|
|
use crate::test_utils::{add_cursor, check_action, extract_offset, extract_range};
|
2018-08-28 06:47:12 -05:00
|
|
|
|
|
|
|
fn check_join_lines(before: &str, after: &str) {
|
|
|
|
check_action(before, after, |file, offset| {
|
|
|
|
let range = TextRange::offset_len(offset, 0.into());
|
|
|
|
let res = join_lines(file, range);
|
|
|
|
Some(res)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_comma() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
<|>foo(1,
|
|
|
|
)
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
<|>foo(1)
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-08-28 06:47:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_lambda_block() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
pub fn reparse(&self, edit: &AtomEdit) -> File {
|
|
|
|
<|>self.incremental_reparse(edit).unwrap_or_else(|| {
|
|
|
|
self.full_reparse(edit)
|
|
|
|
})
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
pub fn reparse(&self, edit: &AtomEdit) -> File {
|
|
|
|
<|>self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-08-28 06:47:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_block() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
foo(<|>{
|
|
|
|
92
|
|
|
|
})
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
foo(<|>92)
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
);
|
2018-08-28 06:47:12 -05:00
|
|
|
}
|
|
|
|
|
2018-10-11 10:11:00 -05:00
|
|
|
#[test]
|
|
|
|
fn test_join_lines_normal_comments() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
// Hello<|>
|
|
|
|
// world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
// Hello<|> world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-11 10:11:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_doc_comments() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
/// Hello<|>
|
|
|
|
/// world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
/// Hello<|> world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-11 10:11:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_mod_comments() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
//! Hello<|>
|
|
|
|
//! world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
//! Hello<|> world!
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-11 10:11:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2018-10-11 10:16:12 -05:00
|
|
|
fn test_join_lines_multiline_comments_1() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
// Hello<|>
|
|
|
|
/* world! */
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-11 10:11:00 -05:00
|
|
|
fn foo() {
|
|
|
|
// Hello<|> world! */
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-11 10:11:00 -05:00
|
|
|
}
|
|
|
|
|
2018-10-11 10:16:12 -05:00
|
|
|
#[test]
|
|
|
|
fn test_join_lines_multiline_comments_2() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines(
|
|
|
|
r"
|
2018-10-11 10:16:12 -05:00
|
|
|
fn foo() {
|
|
|
|
// The<|>
|
|
|
|
/* quick
|
|
|
|
brown
|
|
|
|
fox! */
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-11 10:16:12 -05:00
|
|
|
fn foo() {
|
|
|
|
// The<|> quick
|
|
|
|
brown
|
|
|
|
fox! */
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-11 10:16:12 -05:00
|
|
|
}
|
|
|
|
|
2018-08-29 10:35:28 -05:00
|
|
|
fn check_join_lines_sel(before: &str, after: &str) {
|
|
|
|
let (sel, before) = extract_range(before);
|
|
|
|
let file = File::parse(&before);
|
|
|
|
let result = join_lines(&file, sel);
|
|
|
|
let actual = result.edit.apply(&before);
|
|
|
|
assert_eq_text!(after, &actual);
|
|
|
|
}
|
2018-08-28 06:47:12 -05:00
|
|
|
|
2018-08-29 10:35:28 -05:00
|
|
|
#[test]
|
|
|
|
fn test_join_lines_selection_fn_args() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines_sel(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
<|>foo(1,
|
|
|
|
2,
|
|
|
|
3,
|
|
|
|
<|>)
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
foo(1, 2, 3)
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-08-29 10:35:28 -05:00
|
|
|
}
|
2018-08-28 06:47:12 -05:00
|
|
|
|
2018-08-29 10:35:28 -05:00
|
|
|
#[test]
|
|
|
|
fn test_join_lines_selection_struct() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines_sel(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
struct Foo <|>{
|
|
|
|
f: u32,
|
|
|
|
}<|>
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
struct Foo { f: u32 }
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-08-29 10:35:28 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_selection_dot_chain() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines_sel(
|
|
|
|
r"
|
2018-08-28 14:37:49 -05:00
|
|
|
fn foo() {
|
|
|
|
join(<|>type_params.type_params()
|
|
|
|
.filter_map(|it| it.name())
|
|
|
|
.map(|it| it.text())<|>)
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
r"
|
2018-08-28 14:37:49 -05:00
|
|
|
fn foo() {
|
|
|
|
join(type_params.type_params().filter_map(|it| it.name()).map(|it| it.text()))
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
);
|
2018-08-29 10:35:28 -05:00
|
|
|
}
|
2018-08-29 10:03:14 -05:00
|
|
|
|
2018-08-29 10:35:28 -05:00
|
|
|
#[test]
|
|
|
|
fn test_join_lines_selection_lambda_block_body() {
|
2018-10-15 16:44:23 -05:00
|
|
|
check_join_lines_sel(
|
|
|
|
r"
|
2018-08-29 10:35:28 -05:00
|
|
|
pub fn handle_find_matching_brace() {
|
|
|
|
params.offsets
|
2018-08-29 10:03:14 -05:00
|
|
|
.map(|offset| <|>{
|
|
|
|
world.analysis().matching_brace(&file, offset).unwrap_or(offset)
|
|
|
|
}<|>)
|
|
|
|
.collect();
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
r"
|
2018-08-29 10:35:28 -05:00
|
|
|
pub fn handle_find_matching_brace() {
|
|
|
|
params.offsets
|
2018-08-29 10:03:14 -05:00
|
|
|
.map(|offset| world.analysis().matching_brace(&file, offset).unwrap_or(offset))
|
|
|
|
.collect();
|
2018-10-15 16:44:23 -05:00
|
|
|
}",
|
|
|
|
);
|
2018-08-28 06:47:12 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_on_eq_typed() {
|
|
|
|
fn do_check(before: &str, after: &str) {
|
|
|
|
let (offset, before) = extract_offset(before);
|
|
|
|
let file = File::parse(&before);
|
|
|
|
let result = on_eq_typed(&file, offset).unwrap();
|
|
|
|
let actual = result.edit.apply(&before);
|
|
|
|
assert_eq_text!(after, &actual);
|
|
|
|
}
|
|
|
|
|
|
|
|
// do_check(r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =<|>
|
|
|
|
// }
|
|
|
|
// ", r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =;
|
|
|
|
// }
|
|
|
|
// ");
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
let foo =<|> 1 + 1
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-08-28 06:47:12 -05:00
|
|
|
fn foo() {
|
|
|
|
let foo = 1 + 1;
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-08-28 06:47:12 -05:00
|
|
|
// do_check(r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =<|>
|
|
|
|
// let bar = 1;
|
|
|
|
// }
|
|
|
|
// ", r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =;
|
|
|
|
// let bar = 1;
|
|
|
|
// }
|
|
|
|
// ");
|
|
|
|
}
|
2018-10-09 08:00:20 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_on_enter() {
|
|
|
|
fn apply_on_enter(before: &str) -> Option<String> {
|
|
|
|
let (offset, before) = extract_offset(before);
|
|
|
|
let file = File::parse(&before);
|
|
|
|
let result = on_enter(&file, offset)?;
|
|
|
|
let actual = result.edit.apply(&before);
|
|
|
|
let actual = add_cursor(&actual, result.cursor_position.unwrap());
|
|
|
|
Some(actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn do_check(before: &str, after: &str) {
|
|
|
|
let actual = apply_on_enter(before).unwrap();
|
|
|
|
assert_eq_text!(after, &actual);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn do_check_noop(text: &str) {
|
|
|
|
assert!(apply_on_enter(text).is_none())
|
|
|
|
}
|
|
|
|
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"
|
2018-10-09 08:00:20 -05:00
|
|
|
/// Some docs<|>
|
|
|
|
fn foo() {
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-09 08:00:20 -05:00
|
|
|
/// Some docs
|
|
|
|
/// <|>
|
|
|
|
fn foo() {
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-10-09 08:00:20 -05:00
|
|
|
impl S {
|
|
|
|
/// Some<|> docs.
|
|
|
|
fn foo() {}
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
r"
|
2018-10-09 08:00:20 -05:00
|
|
|
impl S {
|
|
|
|
/// Some
|
|
|
|
/// <|> docs.
|
|
|
|
fn foo() {}
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
);
|
2018-10-09 08:00:20 -05:00
|
|
|
do_check_noop(r"<|>//! docz");
|
|
|
|
}
|
2018-08-28 06:47:12 -05:00
|
|
|
}
|