2018-08-25 05:42:40 -05:00
|
|
|
use std::mem;
|
|
|
|
|
2018-08-23 12:55:23 -05:00
|
|
|
use libsyntax2::{
|
2018-08-25 05:42:40 -05:00
|
|
|
TextUnit, TextRange, SyntaxNodeRef, File, AstNode,
|
|
|
|
ast,
|
2018-08-23 12:55:23 -05:00
|
|
|
algo::{
|
|
|
|
walk::preorder,
|
|
|
|
find_covering_node,
|
|
|
|
},
|
2018-08-28 03:12:42 -05:00
|
|
|
text_utils::{intersect, contains_offset_nonstrict},
|
2018-08-23 13:38:25 -05:00
|
|
|
SyntaxKind::*,
|
2018-08-23 12:55:23 -05:00
|
|
|
};
|
|
|
|
|
2018-08-28 03:12:42 -05:00
|
|
|
use {ActionResult, EditBuilder, find_node_at_offset};
|
2018-08-23 12:55:23 -05:00
|
|
|
|
2018-08-25 03:44:58 -05:00
|
|
|
pub fn join_lines(file: &File, range: TextRange) -> ActionResult {
|
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') {
|
|
|
|
None => return ActionResult {
|
2018-08-23 12:55:23 -05:00
|
|
|
edit: EditBuilder::new().finish(),
|
|
|
|
cursor_position: None
|
2018-08-28 06:06:30 -05:00
|
|
|
},
|
|
|
|
Some(pos) => pos
|
|
|
|
};
|
2018-08-23 12:55:23 -05:00
|
|
|
TextRange::offset_len(
|
|
|
|
range.start() + pos,
|
|
|
|
TextUnit::of_char('\n'),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
range
|
|
|
|
};
|
|
|
|
let node = find_covering_node(file.syntax(), range);
|
|
|
|
let mut edit = EditBuilder::new();
|
|
|
|
for node in preorder(node) {
|
|
|
|
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;
|
|
|
|
remove_newline(&mut edit, node, text.as_str(), off);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ActionResult {
|
|
|
|
edit: edit.finish(),
|
|
|
|
cursor_position: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-28 03:12:42 -05:00
|
|
|
pub fn on_eq_typed(file: &File, offset: TextUnit) -> Option<ActionResult> {
|
|
|
|
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-08-28 13:45:59 -05:00
|
|
|
if file.syntax().text().slice(offset..expr_range.start()).contains('\n') {
|
|
|
|
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());
|
|
|
|
Some(ActionResult {
|
|
|
|
edit: edit.finish(),
|
|
|
|
cursor_position: None,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2018-08-23 12:55:23 -05:00
|
|
|
fn remove_newline(
|
|
|
|
edit: &mut EditBuilder,
|
|
|
|
node: SyntaxNodeRef,
|
|
|
|
node_text: &str,
|
|
|
|
offset: TextUnit,
|
|
|
|
) {
|
2018-08-23 13:38:25 -05:00
|
|
|
if node.kind() == WHITESPACE && node_text.bytes().filter(|&b| b == b'\n').count() == 1 {
|
2018-08-28 06:21:37 -05:00
|
|
|
if join_single_expr_block(edit, node).is_some() {
|
2018-08-25 05:42:40 -05:00
|
|
|
return
|
|
|
|
}
|
2018-08-23 13:38:25 -05:00
|
|
|
match (node.prev_sibling(), node.next_sibling()) {
|
|
|
|
(Some(prev), Some(next)) => {
|
2018-08-23 16:13:16 -05:00
|
|
|
let range = TextRange::from_to(prev.range().start(), node.range().end());
|
2018-08-23 13:38:25 -05:00
|
|
|
if prev.kind() == COMMA && (next.kind() == R_PAREN || next.kind() == R_BRACK) {
|
|
|
|
edit.delete(range);
|
2018-08-23 16:13:16 -05:00
|
|
|
} else if prev.kind() == COMMA && next.kind() == R_CURLY {
|
|
|
|
edit.replace(range, " ".to_string());
|
2018-08-23 13:38:25 -05:00
|
|
|
} else {
|
|
|
|
edit.replace(
|
|
|
|
node.range(),
|
|
|
|
compute_ws(prev, next).to_string(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-23 12:55:23 -05:00
|
|
|
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();
|
|
|
|
|
|
|
|
edit.replace(
|
|
|
|
TextRange::offset_len(offset, ((spaces + 1) as u32).into()),
|
|
|
|
" ".to_string(),
|
|
|
|
);
|
|
|
|
}
|
2018-08-23 13:38:25 -05:00
|
|
|
|
2018-08-28 06:21:37 -05:00
|
|
|
fn join_single_expr_block(
|
2018-08-25 05:42:40 -05:00
|
|
|
edit: &mut EditBuilder,
|
|
|
|
node: SyntaxNodeRef,
|
|
|
|
) -> Option<()> {
|
|
|
|
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-08-28 06:47:12 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
use test_utils::{check_action, extract_range, extract_offset};
|
|
|
|
|
|
|
|
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() {
|
|
|
|
check_join_lines(r"
|
|
|
|
fn foo() {
|
|
|
|
<|>foo(1,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
", r"
|
|
|
|
fn foo() {
|
|
|
|
<|>foo(1)
|
|
|
|
}
|
|
|
|
");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_lambda_block() {
|
|
|
|
check_join_lines(r"
|
|
|
|
pub fn reparse(&self, edit: &AtomEdit) -> File {
|
|
|
|
<|>self.incremental_reparse(edit).unwrap_or_else(|| {
|
|
|
|
self.full_reparse(edit)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
", r"
|
|
|
|
pub fn reparse(&self, edit: &AtomEdit) -> File {
|
|
|
|
<|>self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
|
|
|
|
}
|
|
|
|
");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_block() {
|
|
|
|
check_join_lines(r"
|
|
|
|
fn foo() {
|
|
|
|
foo(<|>{
|
|
|
|
92
|
|
|
|
})
|
|
|
|
}", r"
|
|
|
|
fn foo() {
|
|
|
|
foo(<|>92)
|
|
|
|
}");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_lines_selection() {
|
|
|
|
fn do_check(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);
|
|
|
|
}
|
|
|
|
|
|
|
|
do_check(r"
|
|
|
|
fn foo() {
|
|
|
|
<|>foo(1,
|
|
|
|
2,
|
|
|
|
3,
|
|
|
|
<|>)
|
|
|
|
}
|
|
|
|
", r"
|
|
|
|
fn foo() {
|
|
|
|
foo(1, 2, 3)
|
|
|
|
}
|
|
|
|
");
|
|
|
|
|
|
|
|
do_check(r"
|
|
|
|
struct Foo <|>{
|
|
|
|
f: u32,
|
|
|
|
}<|>
|
|
|
|
", r"
|
|
|
|
struct Foo { f: u32 }
|
|
|
|
");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[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 =;
|
|
|
|
// }
|
|
|
|
// ");
|
|
|
|
do_check(r"
|
|
|
|
fn foo() {
|
|
|
|
let foo =<|> 1 + 1
|
|
|
|
}
|
|
|
|
", r"
|
|
|
|
fn foo() {
|
|
|
|
let foo = 1 + 1;
|
|
|
|
}
|
|
|
|
");
|
|
|
|
// do_check(r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =<|>
|
|
|
|
// let bar = 1;
|
|
|
|
// }
|
|
|
|
// ", r"
|
|
|
|
// fn foo() {
|
|
|
|
// let foo =;
|
|
|
|
// let bar = 1;
|
|
|
|
// }
|
|
|
|
// ");
|
|
|
|
}
|
|
|
|
}
|