mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #4388

Browse Source 
4388: unindent -> dedent r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-05-09 12:49:18 +00:00 committed by GitHub
commit c5c07c2a0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_assists/src/handlers/early_return.rs
View File

@ -156,7 +156,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
parent_block: &ast::BlockExpr,
if_expr: &ast::IfExpr,
) -> SyntaxNode {
let then_block_items = then_block.unindent(IndentLevel::from(1));
let then_block_items = then_block.dedent(IndentLevel::from(1));
let end_of_then = then_block_items.syntax().last_child_or_token().unwrap();
let end_of_then =
if end_of_then.prev_sibling_or_token().map(|n| n.kind()) == Some(WHITESPACE) {

2
crates/ra_syntax/src/ast/edit.rs
View File

@ -555,7 +555,7 @@ pub trait AstNodeEdit: AstNode + Clone + Sized {
Self::cast(indent.increase_indent(self.syntax().clone())).unwrap()
}
#[must_use]
fn unindent(&self, indent: IndentLevel) -> Self {
fn dedent(&self, indent: IndentLevel) -> Self {
Self::cast(indent.decrease_indent(self.syntax().clone())).unwrap()
}
}

2
crates/test_utils/src/lib.rs
View File

@ -270,7 +270,7 @@ fn parse_fixture_checks_further_indented_metadata() {
}
#[test]
fn parse_fixture_can_handle_unindented_first_line() {
fn parse_fixture_can_handle_dedented_first_line() {
let fixture = "//- /lib.rs
mod foo;
//- /foo.rs