212 files changed, 10656 insertions, 10935 deletions

diff --git a/crates/ra_assists/src/doc_tests/generated.rs b/crates/ra_assists/src/doc_tests/generated.rs
index e4fa9ee36..d6a34b609 100644
--- a/crates/ra_assists/src/doc_tests/generated.rs
+++ b/crates/ra_assists/src/doc_tests/generated.rs
@@ -180,7 +180,9 @@ trait Trait<T> {
 }
 
 impl Trait<u32> for () {
-    fn foo(&self) -> u32 { todo!() }
+    fn foo(&self) -> u32 {
+        todo!()
+    }
 
 }
 "#####,
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
index 2d6d44980..e466c9a86 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
@@ -1,6 +1,10 @@
 use hir::HasSource;
 use ra_syntax::{
-    ast::{self, edit, make, AstNode, NameOwner},
+    ast::{
+        self,
+        edit::{self, IndentLevel},
+        make, AstNode, NameOwner,
+    },
     SmolStr,
 };
 
@@ -40,7 +44,9 @@ enum AddMissingImplMembersMode {
 // }
 //
 // impl Trait<u32> for () {
-//     fn foo(&self) -> u32 { todo!() }
+//     fn foo(&self) -> u32 {
+//         todo!()
+//     }
 //
 // }
 // ```
@@ -165,7 +171,9 @@ fn add_missing_impl_members_inner(
 
 fn add_body(fn_def: ast::FnDef) -> ast::FnDef {
     if fn_def.body().is_none() {
-        fn_def.with_body(make::block_from_expr(make::expr_todo()))
+        let body = make::block_expr(None, Some(make::expr_todo()));
+        let body = IndentLevel(1).increase_indent(body);
+        fn_def.with_body(body)
     } else {
         fn_def
     }
@@ -181,7 +189,7 @@ mod tests {
     fn test_add_missing_impl_members() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     type Output;
 
@@ -197,8 +205,8 @@ struct S;
 impl Foo for S {
     fn bar(&self) {}
 <|>
-}",
-            "
+}"#,
+            r#"
 trait Foo {
     type Output;
 
@@ -215,10 +223,14 @@ impl Foo for S {
     fn bar(&self) {}
     <|>type Output;
     const CONST: usize = 42;
-    fn foo(&self) { todo!() }
-    fn baz(&self) { todo!() }
+    fn foo(&self) {
+        todo!()
+    }
+    fn baz(&self) {
+        todo!()
+    }
 
-}",
+}"#,
         );
     }
 
@@ -226,7 +238,7 @@ impl Foo for S {
     fn test_copied_overriden_members() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     fn foo(&self);
     fn bar(&self) -> bool { true }
@@ -238,8 +250,8 @@ struct S;
 impl Foo for S {
     fn bar(&self) {}
 <|>
-}",
-            "
+}"#,
+            r#"
 trait Foo {
     fn foo(&self);
     fn bar(&self) -> bool { true }
@@ -250,9 +262,11 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-    <|>fn foo(&self) { todo!() }
+    <|>fn foo(&self) {
+        todo!()
+    }
 
-}",
+}"#,
         );
     }
 
@@ -260,16 +274,18 @@ impl Foo for S {
     fn test_empty_impl_def() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S { <|> }",
-            "
+impl Foo for S { <|> }"#,
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { todo!() }
-}",
+    <|>fn foo(&self) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -277,16 +293,18 @@ impl Foo for S {
     fn fill_in_type_params_1() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl Foo<u32> for S { <|> }",
-            "
+impl Foo<u32> for S { <|> }"#,
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl Foo<u32> for S {
-    <|>fn foo(&self, t: u32) -> &u32 { todo!() }
-}",
+    <|>fn foo(&self, t: u32) -> &u32 {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -294,16 +312,18 @@ impl Foo<u32> for S {
     fn fill_in_type_params_2() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl<U> Foo<U> for S { <|> }",
-            "
+impl<U> Foo<U> for S { <|> }"#,
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl<U> Foo<U> for S {
-    <|>fn foo(&self, t: U) -> &U { todo!() }
-}",
+    <|>fn foo(&self, t: U) -> &U {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -311,16 +331,18 @@ impl<U> Foo<U> for S {
     fn test_cursor_after_empty_impl_def() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S {}<|>",
-            "
+impl Foo for S {}<|>"#,
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { todo!() }
-}",
+    <|>fn foo(&self) {
+        todo!()
+    }
+}"#,
         )
     }
 
@@ -328,22 +350,24 @@ impl Foo for S {
     fn test_qualify_path_1() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar;
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar;
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -351,22 +375,24 @@ impl foo::Foo for S {
     fn test_qualify_path_generic() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -374,22 +400,24 @@ impl foo::Foo for S {
     fn test_qualify_path_and_substitute_param() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
-impl foo::Foo<u32> for S { <|> }",
-            "
+impl foo::Foo<u32> for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
 impl foo::Foo<u32> for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -398,15 +426,15 @@ impl foo::Foo<u32> for S {
         // when substituting params, the substituted param should not be qualified!
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
     pub struct Param;
 }
 struct Param;
 struct S;
-impl foo::Foo<Param> for S { <|> }",
-            "
+impl foo::Foo<Param> for S { <|> }"#,
+            r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
     pub struct Param;
@@ -414,8 +442,10 @@ mod foo {
 struct Param;
 struct S;
 impl foo::Foo<Param> for S {
-    <|>fn foo(&self, bar: Param) { todo!() }
-}",
+    <|>fn foo(&self, bar: Param) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -423,15 +453,15 @@ impl foo::Foo<Param> for S {
     fn test_qualify_path_associated_item() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     impl Bar<T> { type Assoc = u32; }
     trait Foo { fn foo(&self, bar: Bar<u32>::Assoc); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     impl Bar<T> { type Assoc = u32; }
@@ -439,8 +469,10 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -448,15 +480,15 @@ impl foo::Foo for S {
     fn test_qualify_path_nested() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     pub struct Baz;
     trait Foo { fn foo(&self, bar: Bar<Baz>); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     pub struct Baz;
@@ -464,8 +496,10 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -473,22 +507,24 @@ impl foo::Foo for S {
     fn test_qualify_path_fn_trait_notation() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) { todo!() }
-}",
+    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -496,10 +532,10 @@ impl foo::Foo for S {
     fn test_empty_trait() {
         check_assist_not_applicable(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo;
 struct S;
-impl Foo for S { <|> }",
+impl Foo for S { <|> }"#,
         )
     }
 
@@ -507,13 +543,13 @@ impl Foo for S { <|> }",
     fn test_ignore_unnamed_trait_members_and_default_methods() {
         check_assist_not_applicable(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     fn (arg: u32);
     fn valid(some: u32) -> bool { false }
 }
 struct S;
-impl Foo for S { <|> }",
+impl Foo for S { <|> }"#,
         )
     }
 
@@ -544,7 +580,9 @@ trait Foo {
 struct S;
 impl Foo for S {
     <|>type Output;
-    fn foo(&self) { todo!() }
+    fn foo(&self) {
+        todo!()
+    }
 }"#,
         )
     }
@@ -553,7 +591,7 @@ impl Foo for S {
     fn test_default_methods() {
         check_assist(
             add_missing_default_members,
-            "
+            r#"
 trait Foo {
     type Output;
 
@@ -563,8 +601,8 @@ trait Foo {
     fn foo(some: u32) -> bool;
 }
 struct S;
-impl Foo for S { <|> }",
-            "
+impl Foo for S { <|> }"#,
+            r#"
 trait Foo {
     type Output;
 
@@ -576,7 +614,7 @@ trait Foo {
 struct S;
 impl Foo for S {
     <|>fn valid(some: u32) -> bool { false }
-}",
+}"#,
         )
     }
 }
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs
index ea6c56f8c..eede2fe91 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/crates/ra_assists/src/handlers/early_return.rs
@@ -2,7 +2,7 @@ use std::{iter::once, ops::RangeInclusive};
 
 use ra_syntax::{
     algo::replace_children,
-    ast::{self, edit::IndentLevel, make, Block, Pat::TupleStructPat},
+    ast::{self, edit::IndentLevel, make},
     AstNode,
     SyntaxKind::{FN_DEF, LOOP_EXPR, L_CURLY, R_CURLY, WHILE_EXPR, WHITESPACE},
     SyntaxNode,
@@ -47,7 +47,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
     // Check if there is an IfLet that we can handle.
     let if_let_pat = match cond.pat() {
         None => None, // No IfLet, supported.
-        Some(TupleStructPat(pat)) if pat.args().count() == 1 => {
+        Some(ast::Pat::TupleStructPat(pat)) if pat.args().count() == 1 => {
             let path = pat.path()?;
             match path.qualifier() {
                 None => {
@@ -61,9 +61,9 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
     };
 
     let cond_expr = cond.expr()?;
-    let then_block = if_expr.then_branch()?.block()?;
+    let then_block = if_expr.then_branch()?;
 
-    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::Block::cast)?;
+    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::BlockExpr::cast)?;
 
     if parent_block.expr()? != if_expr.clone().into() {
         return None;
@@ -80,7 +80,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
         return None;
     }
 
-    let parent_container = parent_block.syntax().parent()?.parent()?;
+    let parent_container = parent_block.syntax().parent()?;
 
     let early_expression: ast::Expr = match parent_container.kind() {
         WHILE_EXPR | LOOP_EXPR => make::expr_continue(),
@@ -144,13 +144,13 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
             }
         };
         edit.target(if_expr.syntax().text_range());
-        edit.replace_ast(parent_block, ast::Block::cast(new_block).unwrap());
+        edit.replace_ast(parent_block, ast::BlockExpr::cast(new_block).unwrap());
         edit.set_cursor(cursor_position);
 
         fn replace(
             new_expr: &SyntaxNode,
-            then_block: &Block,
-            parent_block: &Block,
+            then_block: &ast::BlockExpr,
+            parent_block: &ast::BlockExpr,
             if_expr: &ast::IfExpr,
         ) -> SyntaxNode {
             let then_block_items = IndentLevel::from(1).decrease_indent(then_block.clone());
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index f5702f6e0..60ec536a7 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -89,6 +89,7 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
             | (ast::Expr::ParenExpr(_), _)
             | (ast::Expr::PathExpr(_), _)
             | (ast::Expr::BlockExpr(_), _)
+            | (ast::Expr::EffectExpr(_), _)
             | (_, ast::Expr::CallExpr(_))
             | (_, ast::Expr::TupleExpr(_))
             | (_, ast::Expr::ArrayExpr(_))
diff --git a/crates/ra_assists/src/handlers/introduce_variable.rs b/crates/ra_assists/src/handlers/introduce_variable.rs
index eda9ac296..39c656305 100644
--- a/crates/ra_assists/src/handlers/introduce_variable.rs
+++ b/crates/ra_assists/src/handlers/introduce_variable.rs
@@ -111,7 +111,7 @@ fn valid_target_expr(node: SyntaxNode) -> Option<ast::Expr> {
 /// expression like a lambda or match arm.
 fn anchor_stmt(expr: ast::Expr) -> Option<(SyntaxNode, bool)> {
     expr.syntax().ancestors().find_map(|node| {
-        if let Some(expr) = node.parent().and_then(ast::Block::cast).and_then(|it| it.expr()) {
+        if let Some(expr) = node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr()) {
             if expr.syntax() == &node {
                 tested_by!(test_introduce_var_last_expr);
                 return Some((node, false));
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index d5ccdd91c..b084dd9ee 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -113,9 +113,9 @@ pub(crate) fn move_arm_cond_to_match_guard(ctx: AssistCtx) -> Option<Assist> {
         "Move condition to match guard",
         |edit| {
             edit.target(if_expr.syntax().text_range());
-            let then_only_expr = then_block.block().and_then(|it| it.statements().next()).is_none();
+            let then_only_expr = then_block.statements().next().is_none();
 
-            match &then_block.block().and_then(|it| it.expr()) {
+            match &then_block.expr() {
                 Some(then_expr) if then_only_expr => {
                     edit.replace(if_expr.syntax().text_range(), then_expr.syntax().text())
                 }
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs
index 1a30b2b3a..f910ded9d 100644
--- a/crates/ra_fmt/src/lib.rs
+++ b/crates/ra_fmt/src/lib.rs
@@ -42,7 +42,6 @@ pub fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
 }
 
 pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
-    let block = block.block()?;
     let has_anything_else = |thing: &SyntaxNode| -> bool {
         let mut non_trivial_children =
             block.syntax().children_with_tokens().filter(|it| match it.kind() {
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index f06cc115b..58b3d10d8 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -203,10 +203,16 @@ impl ExprCollector<'_> {
 
                 self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr)
             }
-            ast::Expr::TryBlockExpr(e) => {
-                let body = self.collect_block_opt(e.body());
-                self.alloc_expr(Expr::TryBlock { body }, syntax_ptr)
-            }
+            ast::Expr::EffectExpr(e) => match e.effect() {
+                ast::Effect::Try(_) => {
+                    let body = self.collect_block_opt(e.block_expr());
+                    self.alloc_expr(Expr::TryBlock { body }, syntax_ptr)
+                }
+                // FIXME: we need to record these effects somewhere...
+                ast::Effect::Async(_) | ast::Effect::Label(_) | ast::Effect::Unsafe(_) => {
+                    self.collect_block_opt(e.block_expr())
+                }
+            },
             ast::Expr::BlockExpr(e) => self.collect_block(e),
             ast::Expr::LoopExpr(e) => {
                 let body = self.collect_block_opt(e.loop_body());
@@ -494,12 +500,8 @@ impl ExprCollector<'_> {
         }
     }
 
-    fn collect_block(&mut self, expr: ast::BlockExpr) -> ExprId {
-        let syntax_node_ptr = AstPtr::new(&expr.clone().into());
-        let block = match expr.block() {
-            Some(block) => block,
-            None => return self.alloc_expr(Expr::Missing, syntax_node_ptr),
-        };
+    fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId {
+        let syntax_node_ptr = AstPtr::new(&block.clone().into());
         self.collect_block_items(&block);
         let statements = block
             .statements()
@@ -517,7 +519,7 @@ impl ExprCollector<'_> {
         self.alloc_expr(Expr::Block { statements, tail }, syntax_node_ptr)
     }
 
-    fn collect_block_items(&mut self, block: &ast::Block) {
+    fn collect_block_items(&mut self, block: &ast::BlockExpr) {
         let container = ContainerId::DefWithBodyId(self.def);
         for item in block.items() {
             let (def, name): (ModuleDefId, Option<ast::Name>) = match item {
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs
index 047452306..4c12d0a15 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/crates/ra_hir_expand/src/db.rs
@@ -330,7 +330,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
             FragmentKind::Expr
         }
         // FIXME: Expand to statements in appropriate positions; HIR lowering needs to handle that
-        EXPR_STMT | BLOCK => FragmentKind::Expr,
+        EXPR_STMT | BLOCK_EXPR => FragmentKind::Expr,
         ARG_LIST => FragmentKind::Expr,
         TRY_EXPR => FragmentKind::Expr,
         TUPLE_EXPR => FragmentKind::Expr,
@@ -342,7 +342,6 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
         CONDITION => FragmentKind::Expr,
         BREAK_EXPR => FragmentKind::Expr,
         RETURN_EXPR => FragmentKind::Expr,
-        BLOCK_EXPR => FragmentKind::Expr,
         MATCH_EXPR => FragmentKind::Expr,
         MATCH_ARM => FragmentKind::Expr,
         MATCH_GUARD => FragmentKind::Expr,
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index 56abc65b8..3d3088965 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/crates/ra_hir_ty/src/tests/simple.rs
@@ -1755,3 +1755,35 @@ fn main() {
     "###
     );
 }
+
+#[test]
+fn effects_smoke_test() {
+    assert_snapshot!(
+        infer(r#"
+fn main() {
+    let x = unsafe { 92 };
+    let y = async { async { () }.await };
+    let z = try { () };
+    let t = 'a: { 92 };
+}
+"#),
+        @r###"
+    11..131 '{     ...2 }; }': ()
+    21..22 'x': i32
+    32..38 '{ 92 }': i32
+    34..36 '92': i32
+    48..49 'y': {unknown}
+    58..80 '{ asyn...wait }': {unknown}
+    60..78 'async ....await': {unknown}
+    66..72 '{ () }': ()
+    68..70 '()': ()
+    90..91 'z': {unknown}
+    94..104 'try { () }': {unknown}
+    98..104 '{ () }': ()
+    100..102 '()': ()
+    114..115 't': i32
+    122..128 '{ 92 }': i32
+    124..126 '92': i32
+    "###
+    )
+}
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 118fceb2e..c529752d4 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -344,7 +344,7 @@ impl<'a> CompletionContext<'a> {
                                 stmt.syntax().text_range() == name_ref.syntax().text_range(),
                             );
                         }
-                        if let Some(block) = ast::Block::cast(node) {
+                        if let Some(block) = ast::BlockExpr::cast(node) {
                             return Some(
                                 block.expr().map(|e| e.syntax().text_range())
                                     == Some(name_ref.syntax().text_range()),
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 4379005aa..8657377de 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -88,7 +88,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         | ITEM_LIST
         | EXTERN_ITEM_LIST
         | USE_TREE_LIST
-        | BLOCK
+        | BLOCK_EXPR
         | MATCH_ARM_LIST
         | ENUM_VARIANT_LIST
         | TOKEN_TREE => Some(FoldKind::Block),
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index d0def7eaa..63fd6b3e4 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -129,8 +129,7 @@ fn has_comma_after(node: &SyntaxNode) -> bool {
 }
 
 fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
-    let block = ast::Block::cast(token.parent())?;
-    let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
+    let block_expr = ast::BlockExpr::cast(token.parent())?;
     if !block_expr.is_standalone() {
         return None;
     }
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index bf97f8c56..86c70ff83 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -120,9 +120,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -153,26 +152,25 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"\n    fn foo() {\n     ..."
-              [email protected] ","
-              [email protected] " "
-              [email protected] "\"\""
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"\n    fn foo() {\n     ..."
+            [email protected] ","
+            [email protected] " "
+            [email protected] "\"\""
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -196,9 +194,8 @@ [email protected]
     [email protected] ")"
   [email protected] " "
   [email protected]
-    [email protected]
-      [email protected] "{"
-      [email protected] "}"
+    [email protected] "{"
+    [email protected] "}"
 "#
             .trim()
         );
@@ -265,10 +262,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -300,10 +296,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -334,10 +329,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -349,10 +343,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 0d924ce58..c43003fd6 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -266,21 +266,20 @@ fn test_expr_order() {
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] "+"
-              [email protected]
-                [email protected] "1"
-            [email protected] "*"
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "}""#,
+      [email protected] "{"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] "+"
+            [email protected]
+              [email protected] "1"
+          [email protected] "*"
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "}""#,
     );
 }
 
@@ -1114,68 +1113,67 @@ fn test_vec() {
     assert_eq!(
         format!("{:#?}", tree).trim(),
         r#"[email protected]
-  [email protected]
-    [email protected] "{"
-    [email protected]
-      [email protected] "let"
-      [email protected]
-        [email protected] "mut"
-        [email protected]
-          [email protected] "v"
-      [email protected] "="
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Vec"
-            [email protected] "::"
-            [email protected]
-              [email protected]
-                [email protected] "new"
-        [email protected]
-          [email protected] "("
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "v"
-        [email protected] "."
-        [email protected]
-          [email protected] "push"
-        [email protected]
-          [email protected] "("
-          [email protected]
-            [email protected] "1u32"
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "v"
-        [email protected] "."
-        [email protected]
-          [email protected] "push"
-        [email protected]
-          [email protected] "("
-          [email protected]
-            [email protected] "2"
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "v"
-    [email protected] "}""#
+  [email protected] "{"
+  [email protected]
+    [email protected] "let"
+    [email protected]
+      [email protected] "mut"
+      [email protected]
+        [email protected] "v"
+    [email protected] "="
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Vec"
+          [email protected] "::"
+          [email protected]
+            [email protected]
+              [email protected] "new"
+      [email protected]
+        [email protected] "("
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "v"
+      [email protected] "."
+      [email protected]
+        [email protected] "push"
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected] "1u32"
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "v"
+      [email protected] "."
+      [email protected]
+        [email protected] "push"
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected] "2"
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "v"
+  [email protected] "}""#
     );
 }
 
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index c2a6e82e9..d9824ff9b 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -143,7 +143,7 @@ pub(crate) fn reparser(
     parent: Option<SyntaxKind>,
 ) -> Option<fn(&mut Parser)> {
     let res = match node {
-        BLOCK => expressions::naked_block,
+        BLOCK_EXPR => expressions::block,
         RECORD_FIELD_DEF_LIST => items::record_field_def_list,
         RECORD_FIELD_LIST => items::record_field_list,
         ENUM_VARIANT_LIST => items::enum_variant_list,
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index cb30b25a8..a23dbcacf 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -59,16 +59,7 @@ pub(crate) fn block(p: &mut Parser) {
         p.error("expected a block");
         return;
     }
-    atom::block_expr(p, None);
-}
-
-pub(crate) fn naked_block(p: &mut Parser) {
-    assert!(p.at(T!['{']));
-    let m = p.start();
-    p.bump(T!['{']);
-    expr_block_contents(p);
-    p.expect(T!['}']);
-    m.complete(p, BLOCK);
+    atom::block_expr(p);
 }
 
 fn is_expr_stmt_attr_allowed(kind: SyntaxKind) -> bool {
@@ -197,7 +188,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
     }
 }
 
-pub(crate) fn expr_block_contents(p: &mut Parser) {
+pub(super) fn expr_block_contents(p: &mut Parser) {
     // This is checked by a validator
     attributes::inner_attributes(p);
 
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 166dfc472..efb424dae 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -92,7 +92,12 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
                 T![loop] => loop_expr(p, Some(m)),
                 T![for] => for_expr(p, Some(m)),
                 T![while] => while_expr(p, Some(m)),
-                T!['{'] => block_expr(p, Some(m)),
+                // test labeled_block
+                // fn f() { 'label: {}; }
+                T!['{'] => {
+                    block_expr(p);
+                    m.complete(p, EFFECT_EXPR)
+                }
                 _ => {
                     // test_err misplaced_label_err
                     // fn main() {
@@ -108,13 +113,17 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
             let m = p.start();
             p.bump(T![async]);
             p.eat(T![move]);
-            block_expr(p, Some(m))
+            block_expr(p);
+            m.complete(p, EFFECT_EXPR)
         }
         T![match] => match_expr(p),
+        // test unsafe_block
+        // fn f() { unsafe { } }
         T![unsafe] if la == T!['{'] => {
             let m = p.start();
             p.bump(T![unsafe]);
-            block_expr(p, Some(m))
+            block_expr(p);
+            m.complete(p, EFFECT_EXPR)
         }
         T!['{'] => {
             // test for_range_from
@@ -123,7 +132,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
             //        break;
             //    }
             // }
-            block_expr(p, None)
+            block_expr(p)
         }
         T![return] => return_expr(p),
         T![continue] => continue_expr(p),
@@ -134,7 +143,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
         }
     };
     let blocklike = match done.kind() {
-        IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | TRY_BLOCK_EXPR => {
+        IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | EFFECT_EXPR => {
             BlockLike::Block
         }
         _ => BlockLike::NotBlock,
@@ -234,7 +243,7 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
         if p.at(T!['{']) {
             // test lambda_ret_block
             // fn main() { || -> i32 { 92 }(); }
-            block_expr(p, None);
+            block_expr(p);
         } else {
             p.error("expected `{`");
         }
@@ -461,13 +470,13 @@ fn match_guard(p: &mut Parser) -> CompletedMarker {
 // test block_expr
 // fn foo() {
 //     {};
-//     unsafe {};
-//     'label: {};
 // }
-pub(super) fn block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
+pub(super) fn block_expr(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T!['{']));
-    let m = m.unwrap_or_else(|| p.start());
-    naked_block(p);
+    let m = p.start();
+    p.bump(T!['{']);
+    expr_block_contents(p);
+    p.expect(T!['}']);
     m.complete(p, BLOCK_EXPR)
 }
 
@@ -552,8 +561,8 @@ fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     }
 
     p.bump(T![try]);
-    block(p);
-    m.complete(p, TRY_EXPR)
+    block_expr(p);
+    m.complete(p, EFFECT_EXPR)
 }
 
 // test box_expr
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 524e7d784..e7404492a 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -191,7 +191,7 @@ pub enum SyntaxKind {
     RECORD_LIT,
     RECORD_FIELD_LIST,
     RECORD_FIELD,
-    TRY_BLOCK_EXPR,
+    EFFECT_EXPR,
     BOX_EXPR,
     CALL_EXPR,
     INDEX_EXPR,
@@ -204,7 +204,6 @@ pub enum SyntaxKind {
     PREFIX_EXPR,
     RANGE_EXPR,
     BIN_EXPR,
-    BLOCK,
     EXTERN_BLOCK,
     EXTERN_ITEM_LIST,
     ENUM_VARIANT,
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index a716e525b..1876afe95 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -16,7 +16,7 @@ use crate::{
 };
 
 pub use self::{
-    expr_extensions::{ArrayExprKind, BinOp, ElseBranch, LiteralKind, PrefixOp, RangeOp},
+    expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp},
     extensions::{
         AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents,
         StructKind, TypeBoundKind, VisibilityKind,
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 26e4576ff..c507dc683 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -28,7 +28,7 @@ impl ast::BinExpr {
 
 impl ast::FnDef {
     #[must_use]
-    pub fn with_body(&self, body: ast::Block) -> ast::FnDef {
+    pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef {
         let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
         let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
             old_body.syntax().clone().into()
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index ecf74fd36..7ee36e60c 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -16,7 +16,7 @@ impl ast::Expr {
             | ast::Expr::WhileExpr(_)
             | ast::Expr::BlockExpr(_)
             | ast::Expr::MatchExpr(_)
-            | ast::Expr::TryBlockExpr(_) => true,
+            | ast::Expr::EffectExpr(_) => true,
             _ => false,
         }
     }
@@ -359,6 +359,33 @@ impl ast::Literal {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Effect {
+    Async(SyntaxToken),
+    Unsafe(SyntaxToken),
+    Try(SyntaxToken),
+    // Very much not an effect, but we stuff it into this node anyway
+    Label(ast::Label),
+}
+
+impl ast::EffectExpr {
+    pub fn effect(&self) -> Effect {
+        if let Some(token) = self.async_token() {
+            return Effect::Async(token);
+        }
+        if let Some(token) = self.unsafe_token() {
+            return Effect::Unsafe(token);
+        }
+        if let Some(token) = self.try_token() {
+            return Effect::Try(token);
+        }
+        if let Some(label) = self.label() {
+            return Effect::Label(label);
+        }
+        unreachable!("ast::EffectExpr without Effect")
+    }
+}
+
 impl ast::BlockExpr {
     /// false if the block is an intrinsic part of the syntax and can't be
     /// replaced with arbitrary expression.
@@ -368,15 +395,12 @@ impl ast::BlockExpr {
     /// const FOO: () = { stand_alone };
     /// ```
     pub fn is_standalone(&self) -> bool {
-        if self.unsafe_token().is_some() || self.async_token().is_some() {
-            return false;
-        }
-        let kind = match self.syntax().parent() {
+        let parent = match self.syntax().parent() {
+            Some(it) => it,
             None => return true,
-            Some(it) => it.kind(),
         };
-        match kind {
-            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | TRY_BLOCK_EXPR => false,
+        match parent.kind() {
+            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR => false,
             _ => true,
         }
     }
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 2096f12f1..5e844d5ae 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -476,13 +476,16 @@ impl LoopExpr {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryBlockExpr {
+pub struct EffectExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for TryBlockExpr {}
-impl TryBlockExpr {
+impl ast::AttrsOwner for EffectExpr {}
+impl EffectExpr {
+    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
     pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
-    pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -551,11 +554,12 @@ pub struct BlockExpr {
     pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for BlockExpr {}
+impl ast::ModuleItemOwner for BlockExpr {}
 impl BlockExpr {
-    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
-    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
-    pub fn block(&self) -> Option<Block> { support::child(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -627,8 +631,8 @@ pub struct TryExpr {
 }
 impl ast::AttrsOwner for TryExpr {}
 impl TryExpr {
-    pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn question_mark_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![?]) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1122,19 +1126,6 @@ impl Condition {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Block {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for Block {}
-impl ast::ModuleItemOwner for Block {}
-impl Block {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParamList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1477,7 +1468,7 @@ pub enum Expr {
     FieldExpr(FieldExpr),
     AwaitExpr(AwaitExpr),
     TryExpr(TryExpr),
-    TryBlockExpr(TryBlockExpr),
+    EffectExpr(EffectExpr),
     CastExpr(CastExpr),
     RefExpr(RefExpr),
     PrefixExpr(PrefixExpr),
@@ -1960,8 +1951,8 @@ impl AstNode for LoopExpr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TryBlockExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_BLOCK_EXPR }
+impl AstNode for EffectExpr {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2653,17 +2644,6 @@ impl AstNode for Condition {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Block {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for ParamList {
     fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -3312,8 +3292,8 @@ impl From<AwaitExpr> for Expr {
 impl From<TryExpr> for Expr {
     fn from(node: TryExpr) -> Expr { Expr::TryExpr(node) }
 }
-impl From<TryBlockExpr> for Expr {
-    fn from(node: TryBlockExpr) -> Expr { Expr::TryBlockExpr(node) }
+impl From<EffectExpr> for Expr {
+    fn from(node: EffectExpr) -> Expr { Expr::EffectExpr(node) }
 }
 impl From<CastExpr> for Expr {
     fn from(node: CastExpr) -> Expr { Expr::CastExpr(node) }
@@ -3345,9 +3325,10 @@ impl AstNode for Expr {
             TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
             | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
             | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
-            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
-            | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL
-            | BOX_EXPR => true,
+            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
+            | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
+                true
+            }
             _ => false,
         }
     }
@@ -3375,7 +3356,7 @@ impl AstNode for Expr {
             FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
             AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
             TRY_EXPR => Expr::TryExpr(TryExpr { syntax }),
-            TRY_BLOCK_EXPR => Expr::TryBlockExpr(TryBlockExpr { syntax }),
+            EFFECT_EXPR => Expr::EffectExpr(EffectExpr { syntax }),
             CAST_EXPR => Expr::CastExpr(CastExpr { syntax }),
             REF_EXPR => Expr::RefExpr(RefExpr { syntax }),
             PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }),
@@ -3412,7 +3393,7 @@ impl AstNode for Expr {
             Expr::FieldExpr(it) => &it.syntax,
             Expr::AwaitExpr(it) => &it.syntax,
             Expr::TryExpr(it) => &it.syntax,
-            Expr::TryBlockExpr(it) => &it.syntax,
+            Expr::EffectExpr(it) => &it.syntax,
             Expr::CastExpr(it) => &it.syntax,
             Expr::RefExpr(it) => &it.syntax,
             Expr::PrefixExpr(it) => &it.syntax,
@@ -3893,7 +3874,7 @@ impl std::fmt::Display for LoopExpr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TryBlockExpr {
+impl std::fmt::Display for EffectExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4208,11 +4189,6 @@ impl std::fmt::Display for Condition {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Block {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ParamList {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 492088353..7b17fef49 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -82,14 +82,6 @@ pub fn block_expr(
     ast_from_text(&format!("fn f() {}", buf))
 }
 
-pub fn block_from_expr(e: ast::Expr) -> ast::Block {
-    return from_text(&format!("{{ {} }}", e));
-
-    fn from_text(text: &str) -> ast::Block {
-        ast_from_text(&format!("fn f() {}", text))
-    }
-}
-
 pub fn expr_unit() -> ast::Expr {
     expr_from_text("()")
 }
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index ceeb2bde9..d0234cada 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -237,8 +237,7 @@ fn api_walkthrough() {
 
     // Let's get the `1 + 1` expression!
     let body: ast::BlockExpr = func.body().unwrap();
-    let block = body.block().unwrap();
-    let expr: ast::Expr = block.expr().unwrap();
+    let expr: ast::Expr = body.expr().unwrap();
 
     // Enums are used to group related ast nodes together, and can be used for
     // matching. However, because there are no public fields, it's possible to
@@ -274,8 +273,8 @@ fn api_walkthrough() {
     assert_eq!(text.to_string(), "1 + 1");
 
     // There's a bunch of traversal methods on `SyntaxNode`:
-    assert_eq!(expr_syntax.parent().as_ref(), Some(block.syntax()));
-    assert_eq!(block.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
+    assert_eq!(expr_syntax.parent().as_ref(), Some(body.syntax()));
+    assert_eq!(body.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
     assert_eq!(
         expr_syntax.next_sibling_or_token().map(|it| it.kind()),
         Some(SyntaxKind::WHITESPACE)
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index 8e962ab5b..2c08f7e6e 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -6,19 +6,17 @@ use crate::{
     SyntaxKind::*,
 };
 
-pub(crate) fn validate_block_expr(expr: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
-    if let Some(parent) = expr.syntax().parent() {
+pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
+    if let Some(parent) = block.syntax().parent() {
         match parent.kind() {
-            FN_DEF | EXPR_STMT | BLOCK => return,
+            FN_DEF | EXPR_STMT | BLOCK_EXPR => return,
             _ => {}
         }
     }
-    if let Some(block) = expr.block() {
-        errors.extend(block.attrs().map(|attr| {
-            SyntaxError::new(
-                "A block in this position cannot accept inner attributes",
-                attr.syntax().text_range(),
-            )
-        }))
-    }
+    errors.extend(block.attrs().map(|attr| {
+        SyntaxError::new(
+            "A block in this position cannot accept inner attributes",
+            attr.syntax().text_range(),
+        )
+    }))
 }
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 95cc83caa..375ed45e0 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -28,10 +28,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n\n"
   [email protected]
     [email protected] "#"
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index dc3e12091..b72c92c33 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -21,9 +21,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 97539fcf2..33953d8d7 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -9,10 +9,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -34,30 +33,28 @@ [email protected]
           [email protected] "true"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected] "1"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected] "1"
+        [email protected] "\n    "
+        [email protected] "}"
       [email protected] " "
       [email protected] "else"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected]
-              [email protected] "2"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "3"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected]
+            [email protected] "2"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "3"
+        [email protected] "\n    "
+        [email protected] "}"
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
@@ -71,10 +68,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected BANG
 error 19..19: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index e10bb8174..06a326d26 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "->"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "unsafe"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "->"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: expected `{`
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 61c361833..9323b7890 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -25,8 +25,7 @@ [email protected]
                 [email protected] "T"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 19..19: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 92bb47316..93434f34f 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -9,36 +9,35 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] "\n    "
-              [email protected] ")"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] "\n    "
+            [email protected] ")"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 38..38: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 7bc718302..628315c78 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -20,28 +20,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] " "
-          [email protected] "+"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] " "
+        [email protected] "+"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 44..44: expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 63194f974..31cc4e551 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -33,89 +33,88 @@ [email protected]
                   [email protected] "ScopeId"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "res"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "self"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "scopes"
-                [email protected] "."
-                [email protected]
-                  [email protected] "len"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ";"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "self"
-                [email protected] "."
-                [email protected]
-                  [email protected] "scopes"
-              [email protected] "."
-              [email protected]
-                [email protected] "push"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "ScopeData"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "parent"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "None"
-                    [email protected] ","
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "entries"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "vec"
-                        [email protected] "!"
-                        [email protected]
-                          [email protected] "["
-                          [email protected] "]"
-                    [email protected] " "
-                    [email protected] "}"
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "res"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "self"
+                [email protected] "."
+                [email protected]
+                  [email protected] "scopes"
+              [email protected] "."
+              [email protected]
+                [email protected] "len"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "self"
+              [email protected] "."
+              [email protected]
+                [email protected] "scopes"
+            [email protected] "."
+            [email protected]
+              [email protected] "push"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "ScopeData"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "parent"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "None"
+                  [email protected] ","
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "entries"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "vec"
+                      [email protected] "!"
+                      [email protected]
+                        [email protected] "["
+                        [email protected] "]"
+                  [email protected] " "
+                  [email protected] "}"
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index d20bb60f1..4ff27f5c8 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -9,91 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "foo"
-          [email protected] " "
-          [email protected] "="
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "baz"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+        [email protected] " "
+        [email protected] "="
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "baz"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: expected expression
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 1185f44f9..5f3a31473 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -12,9 +12,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 2..2: expected a name
 error 2..2: expected function arguments
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index c7bf4caa0..1746bd3c1 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -26,10 +26,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected COLON
 error 16..16: expected type
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index cc0d75cc8..28146f44e 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "struct"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected]
-            [email protected] "]"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "struct"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected]
+          [email protected] "]"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -51,44 +50,43 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "impl"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "impl"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -100,53 +98,52 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "]"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "trait"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "]"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "trait"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected expression
 error 17..17: expected R_BRACK
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index c37594146..9ea9d715e 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -9,31 +9,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "foo"
-          [email protected] "!"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] "\n        "
-            [email protected] "bar"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "\"baz\""
-            [email protected] ","
-            [email protected] " "
-            [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "2.0"
-        [email protected] "\n    "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "foo"
+        [email protected] "!"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] "\n        "
+          [email protected] "bar"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "\"baz\""
+          [email protected] ","
+          [email protected] " "
+          [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "2.0"
+      [email protected] "\n    "
+      [email protected] "}"
   [email protected] " "
   [email protected] "//~ ERROR incorrect c ..."
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 4296355f2..7c957fdde 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -62,9 +62,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -76,219 +75,218 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected] "Copy"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "for"
-                  [email protected]
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                    [email protected] ">"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Trait"
-                        [email protected]
-                          [email protected] "<"
-                          [email protected]
-                            [email protected] "\'a"
-                          [email protected] ">"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Box"
-                [email protected]
-                  [email protected] "<"
-                  [email protected]
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "?"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Sized"
-        [email protected]
-          [email protected]
-            [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "+"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "for"
-                        [email protected]
-                          [email protected] "<"
-                        [email protected]
-                          [email protected] "\'a"
-                      [email protected] ">"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "Trait"
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                  [email protected] ">"
-                  [email protected]
-                    [email protected] ")"
-                [email protected] " "
-                [email protected] "+"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Copy"
-                  [email protected] ")"
-              [email protected] ">"
-              [email protected]
-                [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] "for"
-                              [email protected]
-                                [email protected] "<"
-                                [email protected]
-                                  [email protected] "\'a"
-                                [email protected] ">"
-                              [email protected] " "
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected]
-                                      [email protected] "Trait"
-                                    [email protected]
-                                      [email protected] "<"
-                                      [email protected]
-                                        [email protected] "\'a"
-                                      [email protected] ">"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Copy"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected] "Copy"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "for"
+                [email protected]
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                  [email protected] ">"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Trait"
+                      [email protected]
+                        [email protected] "<"
+                        [email protected]
+                          [email protected] "\'a"
+                        [email protected] ">"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Box"
+              [email protected]
+                [email protected] "<"
+                [email protected]
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "?"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Sized"
+      [email protected]
+        [email protected]
+          [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "+"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "for"
+                      [email protected]
+                        [email protected] "<"
+                      [email protected]
+                        [email protected] "\'a"
+                    [email protected] ">"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "Trait"
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                [email protected] ">"
+                [email protected]
+                  [email protected] ")"
+              [email protected] " "
+              [email protected] "+"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Copy"
+                [email protected] ")"
+            [email protected] ">"
+            [email protected]
+              [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] "for"
+                            [email protected]
+                              [email protected] "<"
+                              [email protected]
+                                [email protected] "\'a"
+                              [email protected] ">"
+                            [email protected] " "
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected]
+                                    [email protected] "Trait"
+                                  [email protected]
+                                    [email protected] "<"
+                                    [email protected]
+                                      [email protected] "\'a"
+                                    [email protected] ">"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Copy"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 88..88: expected COMMA
 error 88..88: expected R_ANGLE
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 195c08bd9..88b086daf 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -9,187 +9,185 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var1"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var2"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "String"
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var3"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "abc"
-                  [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-                [email protected]
-                  [email protected] ","
-                [email protected] " "
-                [email protected] "//~ ERROR: expected t ..."
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected] "// recover..."
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test2"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Fine"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test3"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "StillFine"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "def"
-                  [email protected] ":"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "i32"
-                [email protected] ","
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "// fail again"
-                [email protected] "\n        "
-                [email protected] "enum"
-                [email protected] " "
-                [email protected]
-                  [email protected] "Test4"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "\n            "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Nope"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "i32"
-                      [email protected] " "
-                      [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-                  [email protected]
-                    [email protected] ")"
-                  [email protected] " "
-                  [email protected] "//~ ERROR: found `{`"
-                  [email protected] "\n                     ..."
-                  [email protected] "//~^ ERROR: found `{`"
-                  [email protected] "\n        "
-                  [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected] "// still recover later"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bad_syntax"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "//~ ERROR: expected e ..."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var1"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var2"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "String"
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var3"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "abc"
+                [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ","
+              [email protected] " "
+              [email protected] "//~ ERROR: expected t ..."
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected] "// recover..."
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test2"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Fine"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test3"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "StillFine"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "def"
+                [email protected] ":"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "i32"
+              [email protected] ","
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "// fail again"
+            [email protected] "\n        "
+            [email protected] "enum"
+            [email protected] " "
+            [email protected]
+              [email protected] "Test4"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "Nope"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "i32"
+                  [email protected] " "
+                  [email protected]
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "//~ ERROR: found `{`"
+              [email protected] "\n                     ..."
+              [email protected] "//~^ ERROR: found `{`"
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected] "// still recover later"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bad_syntax"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "//~ ERROR: expected e ..."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 95..95: expected type
 error 95..95: expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index f2fada510..568a4cc02 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -21,9 +21,8 @@ [email protected]
             [email protected] ">"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 26..26: expected a path
 error 26..26: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 56682f966..0da8f59f0 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -20,17 +20,16 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "a"
-          [email protected] "."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "a"
+        [email protected] "."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 21..21: expected field name or number
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index aac476430..515819e42 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -9,115 +9,111 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "inner"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Inner attributes not ..."
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"Nor here\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"We error on each attr\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected] "//! Nor are ModuleDoc ..."
-                [email protected] "\n    "
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "while"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "true"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Nor here\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "inner"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attributes not ..."
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Nor here\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"We error on each attr\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected] "//! Nor are ModuleDoc ..."
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "while"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "true"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Nor here\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 39..83: A block in this position cannot accept inner attributes
 error 152..171: A block in this position cannot accept inner attributes
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index f98de7f15..c6859eca8 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -9,187 +9,186 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Not allowed here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Nor here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-              [email protected]
-                [email protected] "!"
-              [email protected]
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "\"Nor here\""
-                    [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Not allowed here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Nor here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+            [email protected]
+              [email protected] "!"
+            [email protected]
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "doc"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "\"Nor here\""
+                  [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 52..52: expected `[`
 error 52..52: expected pattern
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index d0017c883..53e445459 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -9,58 +9,57 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 80..80: expected pattern
 error 80..80: expected FAT_ARROW
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 2c0bddec8..1b2ac5011 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -9,84 +9,83 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
 error 24..24: expected a name
 error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 83851f5d2..9588cf3b3 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -44,9 +44,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error 17..17: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index a328222aa..e3cda7c43 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -27,9 +27,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
@@ -44,9 +43,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index bcd1fad69..21db9ee85 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -9,22 +9,21 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "0"
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "0"
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..20: An inclusive range must have an end expression
 error 26..29: An inclusive range must have an end expression
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index 433ea7bad..ec950381b 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -18,66 +18,65 @@ [email protected]
               [email protected] "i32"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected] "1"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "3"
-                  [email protected] "]"
-                [email protected] "."
-                [email protected]
-                  [email protected] "iter"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] "\n        "
-              [email protected] "."
-              [email protected]
-                [email protected] "map"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "|"
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "it"
-                    [email protected] "|"
-                [email protected] ")"
-            [email protected] "\n        "
-            [email protected] "."
-            [email protected]
-              [email protected] "max"
-            [email protected]
-              [email protected] "::"
-              [email protected] "<"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] ">"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected] "1"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "2"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "3"
+                [email protected] "]"
+              [email protected] "."
+              [email protected]
+                [email protected] "iter"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] "\n        "
+            [email protected] "."
+            [email protected]
+              [email protected] "map"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "|"
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "it"
+                  [email protected] "|"
+              [email protected] ")"
+          [email protected] "\n        "
+          [email protected] "."
+          [email protected]
+            [email protected] "max"
+          [email protected]
+            [email protected] "::"
+            [email protected] "<"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] ">"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 56..56: expected expression
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 85bf276a0..75668c818 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -9,19 +9,18 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'loop"
-              [email protected] ":"
-        [email protected] " "
-        [email protected]
-          [email protected] "impl"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'loop"
+            [email protected] ":"
+      [email protected] " "
+      [email protected]
+        [email protected] "impl"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 22..22: expected a loop
 error 22..22: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index b901c17f7..c789e8d82 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
@@ -8,9 +8,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] " "
   [email protected]
     [email protected] "unsafe"
@@ -29,9 +28,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 11..11: expected an item
 error 18..18: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index 3f48b86ed..cd24313d4 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -9,24 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index be02eaeeb..c5fa7a404 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -9,18 +9,17 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "pub"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "pub"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 14..14: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index b344e4f7f..0656fdf73 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -9,53 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "A"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n   "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "B"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "A"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n   "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "B"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: attributes are not allowed on BIN_EXPR
 error 44..44: attributes are not allowed on IF_EXPR
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index 5339a84d7..e1abc5633 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -9,45 +9,44 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected] "0."
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "1i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "0x01"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected] "0."
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "1i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "0x01"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
 error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 20ed39046..9be441110 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -14,9 +14,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "unsafe"
@@ -33,9 +32,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 6..6: expected existential, fn, trait or impl
 error 31..31: expected existential, fn, trait or impl
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index 88567263e..b8cd0587d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -45,9 +45,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index 578befa56..a9de44b57 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -9,41 +9,40 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "S"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "field"
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "S"
-                      [email protected] "::"
-                      [email protected]
-                        [email protected]
-                          [email protected] "default"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "S"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "field"
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "S"
+                    [email protected] "::"
+                    [email protected]
+                      [email protected]
+                        [email protected] "default"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 25..25: expected COLON
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index a1fabb557..a38b4f573 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -51,9 +51,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index a46d76fde..9dc473e43 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -55,8 +55,7 @@ [email protected]
                     [email protected] ")"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 5181fcd2b..6c8c1e24b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
@@ -32,7 +32,6 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index dd41b44e1..9f4a9e69b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -23,9 +23,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -41,9 +40,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -61,9 +59,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -95,9 +92,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -113,9 +109,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index a8ddd20c9..10eb31d68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -9,89 +9,88 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-              [email protected] "::"
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected]
-                  [email protected] "Bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected] ".."
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "::"
+              [email protected]
+                [email protected] "Bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] ".."
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index df8ada62a..425e5196c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -9,18 +9,16 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index de01cc79e..d823c08fc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -9,52 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "foo"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "."
-              [email protected]
-                [email protected] "0"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "."
-              [email protected]
-                [email protected] "0"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "foo"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "."
+            [email protected]
+              [email protected] "0"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "."
+            [email protected]
+              [email protected] "0"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 8ac307cb3..422912e3c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -9,29 +9,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "continue"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "continue"
-                  [email protected] " "
-                  [email protected] "\'l"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "continue"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "continue"
+              [email protected] " "
+              [email protected] "\'l"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 6f6400d00..15da6fdd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -32,9 +32,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -66,9 +65,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index ba422f1ae..10d6b2fde 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "*"
-            [email protected]
-              [email protected] "*"
-              [email protected]
-                [email protected] "&"
-                [email protected]
-                  [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "!"
-            [email protected]
-              [email protected] "!"
-              [email protected]
-                [email protected] "true"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "-"
-            [email protected]
-              [email protected] "-"
-              [email protected]
-                [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "*"
+          [email protected]
+            [email protected] "*"
+            [email protected]
+              [email protected] "&"
+              [email protected]
+                [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "!"
+          [email protected]
+            [email protected] "!"
+            [email protected]
+              [email protected] "true"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "-"
+          [email protected]
+            [email protected] "-"
+            [email protected]
+              [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index de22b22dd..c204aeb63 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -55,9 +55,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -72,9 +71,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 7da292a2d..7eb27d5e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -9,34 +9,33 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index 574942f06..b4598768e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -9,97 +9,96 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] " "
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "x"
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] " "
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "x"
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index 1927438bb..b824c10a8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -9,42 +9,41 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected]
-                [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index 9effb345f..fabb09937 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -9,82 +9,81 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "82"
-            [email protected] " "
-            [email protected] "as"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "81"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i8"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "79"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i16"
-            [email protected] " "
-            [email protected] "-"
-            [email protected] " "
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "0x36"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "u8"
-            [email protected] " "
-            [email protected] "<="
-            [email protected] " "
-            [email protected]
-              [email protected] "0x37"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "82"
+          [email protected] " "
+          [email protected] "as"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "81"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i8"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "79"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i16"
+          [email protected] " "
+          [email protected] "-"
+          [email protected] " "
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "0x36"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "u8"
+          [email protected] " "
+          [email protected] "<="
+          [email protected] " "
+          [email protected]
+            [email protected] "0x37"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index b6759541e..3aed26732 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -9,39 +9,37 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "if"
-          [email protected] " "
-          [email protected]
-            [email protected] "let"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-              [email protected] "("
-              [email protected]
-                [email protected] "_"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "None"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "if"
+        [email protected] " "
+        [email protected]
+          [email protected] "let"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+            [email protected] "("
+            [email protected]
+              [email protected] "_"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "None"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -53,157 +51,152 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected] "|"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-                [email protected] "("
-                [email protected]
-                  [email protected] "_"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "while"
-          [email protected] " "
-          [email protected]
-            [email protected] "let"
-            [email protected] " "
-            [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-              [email protected] "("
-              [email protected]
-                [email protected] "_"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "None"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected] "|"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+              [email protected] "("
+              [email protected]
+                [email protected] "_"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "while"
+        [email protected] " "
+        [email protected]
+          [email protected] "let"
+          [email protected] " "
+          [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+            [email protected] "("
+            [email protected]
+              [email protected] "_"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "None"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index e5138a599..899b63aac 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -9,81 +9,76 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "it"
-                [email protected] "."
-                [email protected]
-                  [email protected] "next"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "true"
-                  [email protected] " "
-                  [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "it"
+              [email protected] "."
+              [email protected]
+                [email protected] "next"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "true"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index 52644da8f..e064aafaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -9,47 +9,45 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected] "\'l"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "92"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected] "\'l"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "92"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected] "\'l"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected]
+                [email protected] "92"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected] "\'l"
+              [email protected] " "
+              [email protected]
+                [email protected] "92"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
index f061c0cac..cf5825593 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
@@ -16,7 +16,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index e25fc8c3e..fbd90bc0f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -42,38 +42,37 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "<"
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "usize"
-                    [email protected] " "
-                    [email protected] "as"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Default"
-                    [email protected] ">"
-                [email protected] "::"
-                [email protected]
-                  [email protected]
-                    [email protected] "default"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "<"
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "usize"
+                  [email protected] " "
+                  [email protected] "as"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Default"
+                  [email protected] ">"
+              [email protected] "::"
+              [email protected]
+                [email protected]
+                  [email protected] "default"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index a1238d610..a767f145d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "xs"
-            [email protected] "["
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "xs"
+          [email protected] "["
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 69e5fe4bc..e92ea2bf2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -32,13 +32,12 @@ [email protected]
             [email protected] " "
             [email protected]
               [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] " "
-                  [email protected] "}"
+                [email protected] "{"
+                [email protected] " "
+                [email protected]
+                  [email protected] "2"
+                [email protected] " "
+                [email protected] "}"
             [email protected] ","
             [email protected] " "
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index 1a98e2610..aa582516a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -12,10 +12,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "struct"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index bbf6dc494..0c1c6e877 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -9,140 +9,139 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "f"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "1"
-                [email protected] ")"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Foo"
-                        [email protected] ">"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "func"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Foo"
-                        [email protected] " "
-                        [email protected] "as"
-                        [email protected] " "
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Trait"
-                        [email protected] ">"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "func"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "f"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "1"
+              [email protected] ")"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Foo"
+                      [email protected] ">"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "func"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Foo"
+                      [email protected] " "
+                      [email protected] "as"
+                      [email protected] " "
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Trait"
+                      [email protected] ">"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "func"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
index a454dfc3a..c23b3b67c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
@@ -9,22 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "b"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "b"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 2a50f796c..9ca2165ba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -41,7 +41,6 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 7f87e05ec..b209f67f8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -35,9 +35,8 @@ [email protected]
               [email protected] ">"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -77,7 +76,6 @@ [email protected]
               [email protected] ">"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 5f846177e..70232a3b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -9,88 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "a"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-              [email protected] "::"
-              [email protected]
-                [email protected]
-                  [email protected] "b"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected]
-                  [email protected] "a"
-                [email protected]
-                  [email protected] "::"
-                  [email protected] "<"
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "b"
-                  [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "format"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "a"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "b"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "::"
+              [email protected]
+                [email protected] "a"
+              [email protected]
+                [email protected] "::"
+                [email protected] "<"
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "b"
+                [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "format"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index d9310e82e..03c52525e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -9,69 +9,68 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "-"
-                [email protected]
-                  [email protected] "1"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "92"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "\'c\'"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "\"hello\""
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "-"
+              [email protected]
+                [email protected] "1"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "92"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "\'c\'"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "\"hello\""
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 2e727c1ef..24f89b83f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -105,7 +105,6 @@ [email protected]
             [email protected] "\'a"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
index c1e58f9bf..bb43d1eaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 9bdf2379f..8bd94a868 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -9,75 +9,74 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "0"
-                [email protected] " "
-                [email protected] "..."
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "100"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "101"
-                [email protected] " "
-                [email protected] "..="
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "200"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "200"
-                [email protected] " "
-                [email protected] ".."
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "301"
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "0"
+              [email protected] " "
+              [email protected] "..."
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "100"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "101"
+              [email protected] " "
+              [email protected] "..="
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "200"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "200"
+              [email protected] " "
+              [email protected] ".."
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "301"
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index e9ca92364..9210f155c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -9,52 +9,50 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index 15d332938..850465d82 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -9,117 +9,116 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "x"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "y"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "32"
-              [email protected] ","
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "x"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "y"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "32"
-              [email protected] ","
-              [email protected] " "
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Default"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "default"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "TupleStruct"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "0"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "1"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "x"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "y"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "32"
+            [email protected] ","
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "x"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "y"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "32"
+            [email protected] ","
+            [email protected] " "
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Default"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "default"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "TupleStruct"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "0"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "1"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 3cce106e4..02656df31 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 5e1b4cc68..445d8d309 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -9,124 +9,113 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected] "if"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "false"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-              [email protected] " "
-              [email protected] "else"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "true"
-                  [email protected] " "
-                  [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "if"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "false"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+            [email protected] " "
+            [email protected] "else"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "true"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 108e5c5cc..177bb5514 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -9,144 +9,143 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Test"
-                    [email protected] " "
-                    [email protected] ">"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Test"
-                      [email protected]
-                        [email protected] "{"
-                        [email protected]
-                          [email protected]
-                            [email protected] "field"
-                          [email protected] ":"
-                          [email protected] " "
-                          [email protected]
-                            [email protected] "0"
-                        [email protected] "}"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "X"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Y"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Z"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "X"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Y"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Z"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "X"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Test"
+                  [email protected] " "
+                  [email protected] ">"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Test"
+                    [email protected]
+                      [email protected] "{"
+                      [email protected]
+                        [email protected]
+                          [email protected] "field"
+                        [email protected] ":"
+                        [email protected] " "
+                        [email protected]
+                          [email protected] "0"
+                      [email protected] "}"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "X"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "Y"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Z"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "X"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "Y"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Z"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "X"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index 1e888063e..f8ff7079b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -9,45 +9,42 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected]
-                  [email protected] "1"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "&"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected]
-                [email protected] "1"
-              [email protected] "}"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "{"
+            [email protected]
+              [email protected] "1"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "&"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected]
+            [email protected] "1"
+          [email protected] "}"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 218b3ec9e..07b3d1435 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -9,88 +9,85 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "S"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index b8171dc9c..665f716a8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index c2a73ef25..3fd3a4391 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -9,55 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "["
-                [email protected] "]"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "["
+              [email protected] "]"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 39a86d002..97c6e6a9d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -23,22 +22,21 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -50,20 +48,19 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "2"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "2"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -75,16 +72,15 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected]
-          [email protected] "2"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected]
+        [email protected] "2"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index 9621ba59e..e2c1a507d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
@@ -34,7 +34,6 @@ [email protected]
                     [email protected] "Copy"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index ed9d62c5f..4f3a8ed24 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -9,18 +9,17 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "?"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "?"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index 5141ce70d..462d1a8bb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -9,88 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] ".."
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "a"
-                [email protected] "."
-                [email protected]
-                  [email protected] "b"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] ".."
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "a"
+              [email protected] "."
+              [email protected]
+                [email protected] "b"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index cdbe64180..dfb8d57ad 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -89,9 +89,8 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -155,9 +154,8 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -237,7 +235,6 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index fbad33389..7fe96e17d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -9,47 +9,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "&"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "f"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "&"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "f"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index b165789fd..9fcb7899e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -9,128 +9,127 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "true"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "false"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "2.0"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\'a\'"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\'b\'"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\"c\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "r\"d\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\"e\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "br\"f\""
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "true"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "false"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "2.0"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\'a\'"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\'b\'"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\"c\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "r\"d\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\"e\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "br\"f\""
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index 36f17133d..a42abc189 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -30,7 +29,6 @@ [email protected]
         [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index ca5aa007e..7e71d7373 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -8,62 +8,58 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "i"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "break"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "i"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "break"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
index 1c1e349e1..48aaf1004 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
@@ -12,7 +12,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index c264dae5e..aed81f9b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -9,26 +9,25 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "["
-              [email protected]
-                [email protected] "1"
-              [email protected] "]"
-            [email protected] "["
-            [email protected]
-              [email protected] "2"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "["
+            [email protected]
+              [email protected] "1"
+            [email protected] "]"
+          [email protected] "["
+          [email protected]
+            [email protected] "2"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index 24e1ba8a0..67d9595d3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index 47462d44e..031e74652 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -9,122 +9,115 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected] "_"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "macro_rules"
-            [email protected] "!"
-            [email protected] " "
-            [email protected]
-              [email protected] "test"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n         "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] ">"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "test"
-          [email protected] "!"
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected] "_"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "macro_rules"
+          [email protected] "!"
+          [email protected] " "
+          [email protected]
+            [email protected] "test"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n         "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] ">"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "test"
+        [email protected] "!"
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
index a51fb5511..816e49310 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
@@ -13,7 +13,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index 61b47bf35..d48ef865c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -34,9 +33,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -61,9 +59,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -97,7 +94,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index 89d435d1f..e4455cd3e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -9,28 +9,26 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "x"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "["
-              [email protected] "]"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "x"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "["
+            [email protected] "]"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
index 57b4d0c4f..8a8743060 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index ed6f6f326..9f966ff8a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -9,125 +9,124 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "ref"
-                  [email protected] " "
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "g"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "h"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "_"
-              [email protected] ","
-              [email protected] " "
-              [email protected] ".."
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "h"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "_"
-              [email protected] ","
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "ref"
+                [email protected] " "
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected] "g"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "h"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "_"
+            [email protected] ","
+            [email protected] " "
+            [email protected] ".."
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "h"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "_"
+            [email protected] ","
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 461c61914..9b3bef04e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -9,47 +9,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] ","
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ";"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] ","
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ";"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
index 8b2323cf2..f3a5e3096 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
@@ -1,5 +1,5 @@
-SOURCE_FILE@0..52
-  FN_DEF@0..51
+[email protected]1
+  FN_DEF@0..20
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -8,36 +8,14 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] " "
-    [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "unsafe"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'label"
-              [email protected] ":"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
-  [email protected] "\n"
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
index 2fed74c5e..9c6019fb1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
@@ -1,5 +1,3 @@
 fn foo() {
     {};
-    unsafe {};
-    'label: {};
 }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index 73c314e07..e64717152 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -9,132 +9,127 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "->"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i32"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected] "92"
-                [email protected] " "
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] ","
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "->"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i32"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "92"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] ","
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index 5392b1a74..98963dc62 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -9,55 +9,54 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "y"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-            [email protected]
-              [email protected] "::"
-              [email protected] "<"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "T"
-              [email protected] ">"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "y"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+          [email protected]
+            [email protected] "::"
+            [email protected] "<"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "T"
+            [email protected] ">"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index 54f18adac..ea603e2c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -9,31 +9,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "1"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "1"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index 6c9e45684..30ff96a7c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -9,60 +9,56 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'a"
-              [email protected] ":"
-            [email protected] " "
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'b"
-              [email protected] ":"
-            [email protected] " "
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "\'c"
-            [email protected] ":"
-          [email protected] " "
-          [email protected] "for"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "in"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'a"
+            [email protected] ":"
+          [email protected] " "
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'b"
+            [email protected] ":"
+          [email protected] " "
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "\'c"
+          [email protected] ":"
+        [email protected] " "
+        [email protected] "for"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "in"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index a1c5475e7..b58f40ac1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -9,82 +9,81 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index 42a770a83..b67714c17 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -9,120 +9,119 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "b"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected]
-              [email protected] "c"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "d"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "e"
-            [email protected] " "
-            [email protected] "@"
-            [email protected] " "
-            [email protected]
-              [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "f"
-            [email protected] " "
-            [email protected] "@"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "g"
-              [email protected] " "
-              [email protected] "@"
-              [email protected] " "
-              [email protected]
-                [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "b"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected]
+            [email protected] "c"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "d"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "e"
+          [email protected] " "
+          [email protected] "@"
+          [email protected] " "
+          [email protected]
+            [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "f"
+          [email protected] " "
+          [email protected] "@"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "g"
+            [email protected] " "
+            [email protected] "@"
+            [email protected] " "
+            [email protected]
+              [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index 5414c90b8..5de480da9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -8,50 +8,48 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "some_expr"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] ";"
-              [email protected] ";"
-              [email protected] ";"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Ok"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "some_expr"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] ";"
+          [email protected] ";"
+          [email protected] ";"
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Ok"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index 8e080fb60..e152c6b6c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -9,40 +9,39 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected]
-                [email protected] "if"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "foo"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected]
+              [email protected] "if"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "foo"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index 728164f8e..b283ab804 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -9,73 +9,72 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Inner attribute\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Can be\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Stacked\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attribute\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Can be\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Stacked\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 6123885e3..9d5470914 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -9,138 +9,137 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"some\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"other\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"many\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"attributes\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"before\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"some\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"other\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"many\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"attributes\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"before\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 67b9c10d5..ada2fc54e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -59,8 +59,7 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
index baf22a8d7..6178dfe59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index 16f5b90b6..ced59b7c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -9,24 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "crate"
-                [email protected] "::"
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "crate"
+              [email protected] "::"
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 07ed14773..97611f7f3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -9,40 +9,39 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "S"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] " "
-              [email protected]
-                [email protected] "field"
-              [email protected] ":"
-              [email protected] " "
-              [email protected]
-                [email protected] "1"
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "S"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] " "
+            [email protected]
+              [email protected] "field"
+            [email protected] ":"
+            [email protected] " "
+            [email protected]
+              [email protected] "1"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 8307d4c15..09221fc54 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -9,91 +9,89 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "A"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "A"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"