Merge #5053

5053: Fix matchig brace for pipes r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 5 insertions, 1 deletions

diff --git a/crates/ra_ide/src/matching_brace.rs b/crates/ra_ide/src/matching_brace.rs
index 685ba10ad..742d70c9c 100644
--- a/crates/ra_ide/src/matching_brace.rs
+++ b/crates/ra_ide/src/matching_brace.rs
@@ -32,7 +32,10 @@ pub fn matching_brace(file: &SourceFile, offset: TextSize) -> Option<TextSize> {
         return None;
     }
     let matching_kind = BRACES[brace_idx ^ 1];
-    let matching_node = parent.children_with_tokens().find(|node| node.kind() == matching_kind)?;
+    let matching_node = parent
+        .children_with_tokens()
+        .filter_map(|it| it.into_token())
+        .find(|node| node.kind() == matching_kind && node != &brace_token)?;
     Some(matching_node.text_range().start())
 }
 
@@ -57,6 +60,7 @@ mod tests {
 
         do_check("struct Foo { a: i32, }<|>", "struct Foo <|>{ a: i32, }");
         do_check("fn main() { |x: i32|<|> x * 2;}", "fn main() { <|>|x: i32| x * 2;}");
+        do_check("fn main() { <|>|x: i32| x * 2;}", "fn main() { |x: i32<|>| x * 2;}");
 
         {
             mark::check!(pipes_not_braces);