language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

reformat the world

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-08 14:49:43 +03:00
parent 5cb1d41a30
commit 12e3b4c70b
129 changed files with 727 additions and 2509 deletions
Download patch file Download diff file Expand all files Collapse all files

57
crates/ra_ide_api_light/src/extend_selection.rs
View file

@ -43,11 +43,7 @@ pub fn extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange
let node = find_covering_node(root, range);
// Using shallowest node with same range allows us to traverse siblings.
let node = node
.ancestors()
.take_while(|n| n.range() == node.range())
.last()
.unwrap();
let node = node.ancestors().take_while(|n| n.range() == node.range()).last().unwrap();
if range == node.range() {
if string_kinds.contains(&node.kind()) {
@ -145,10 +141,7 @@ fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
}
if let Some(comma_node) = nearby_comma(node, Direction::Prev) {
return Some(TextRange::from_to(
comma_node.range().start(),
node.range().end(),
));
return Some(TextRange::from_to(comma_node.range().start(), node.range().end()));
}
if let Some(comma_node) = nearby_comma(node, Direction::Next) {
@ -160,10 +153,7 @@ fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
.filter(|node| is_single_line_ws(node))
.unwrap_or(comma_node);
return Some(TextRange::from_to(
node.range().start(),
final_node.range().end(),
));
return Some(TextRange::from_to(node.range().start(), final_node.range().end()));
}
return None;
@ -217,36 +207,15 @@ mod tests {
#[test]
fn test_extend_selection_list() {
do_check(r#"fn foo(<|>x: i32) {}"#, &["x", "x: i32"]);
do_check(
r#"fn foo(<|>x: i32, y: i32) {}"#,
&["x", "x: i32", "x: i32, "],
);
do_check(
r#"fn foo(<|>x: i32,y: i32) {}"#,
&["x", "x: i32", "x: i32,"],
);
do_check(
r#"fn foo(x: i32, <|>y: i32) {}"#,
&["y", "y: i32", ", y: i32"],
);
do_check(
r#"fn foo(x: i32, <|>y: i32, ) {}"#,
&["y", "y: i32", ", y: i32"],
);
do_check(
r#"fn foo(x: i32,<|>y: i32) {}"#,
&["y", "y: i32", ",y: i32"],
);
do_check(r#"fn foo(<|>x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
do_check(r#"fn foo(<|>x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,"]);
do_check(r#"fn foo(x: i32, <|>y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
do_check(r#"fn foo(x: i32, <|>y: i32, ) {}"#, &["y", "y: i32", ", y: i32"]);
do_check(r#"fn foo(x: i32,<|>y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
do_check(
r#"const FOO: [usize; 2] = [ 22<|> , 33];"#,
&["22", "22 , "],
);
do_check(r#"const FOO: [usize; 2] = [ 22<|> , 33];"#, &["22", "22 , "]);
do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
do_check(
r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#,
&["33", ", 33"],
);
do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", ", 33"]);
do_check(
r#"
@ -292,11 +261,7 @@ struct B {
<|>
}
"#,
&[
"\n \n",
"{\n \n}",
"/// bla\n/// bla\nstruct B {\n \n}",
],
&["\n \n", "{\n \n}", "/// bla\n/// bla\nstruct B {\n \n}"],
)
}