bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Merge #10538
10538: fix: matching brace should prefer brace on cursor's right r=Veykril a=codgician I observed a brace matching issue with the following Rust code: ```rust let x = (1 + (2 + 3)) * 4; ``` In a situation like `<|>(1 + (2 + 3)) * 4`, the cursor will go to `(1 + (2 + 3)<|>) * 4`, and if user tries to match bracket again it will go like `(1 + <|>(2 + 3)) * 4` while logically the expected result should be `<|>(1 + (2 + 3)) * 4`. This behavior exists in both line cursor style and block cursor style. This PR fixes this by letting `matching_brace` prefer the brace to cursor's right when the cursor lies between multiple consecutive braces. It **does NOT** fix #1942 but could be related. Please review. Co-authored-by: codgician <[email protected]>
Browse Source
bors[bot] 2021-10-14
parent c535487 · parent 7e68db3 · commit 8619058
Diffstat
-rw-r--r--crates/ide/src/matching_brace.rs16
1 files changed, 12 insertions, 4 deletions
diff --git a/crates/ide/src/matching_brace.rs b/crates/ide/src/matching_brace.rs
index 011c8cc553..da70cecdd8 100644
--- a/crates/ide/src/matching_brace.rs
+++ b/crates/ide/src/matching_brace.rs
@@ -19,10 +19,14 @@ use syntax::{
pub(crate) fn matching_brace(file: &SourceFile, offset: TextSize) -> Option<TextSize> {
const BRACES: &[SyntaxKind] =
&[T!['{'], T!['}'], T!['['], T![']'], T!['('], T![')'], T![<], T![>], T![|], T![|]];
- let (brace_token, brace_idx) = file.syntax().token_at_offset(offset).find_map(|node| {
- let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
- Some((node, idx))
- })?;
+ let (brace_token, brace_idx) = file
+ .syntax()
+ .token_at_offset(offset)
+ .filter_map(|node| {
+ let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
+ Some((node, idx))
+ })
+ .last()?;
let parent = brace_token.parent()?;
if brace_token.kind() == T![|] && !ast::ParamList::can_cast(parent.kind()) {
cov_mark::hit!(pipes_not_braces);
@@ -58,6 +62,10 @@ mod tests {
do_check("struct Foo { a: i32, }$0", "struct Foo $0{ a: i32, }");
do_check("fn main() { |x: i32|$0 x * 2;}", "fn main() { $0|x: i32| x * 2;}");
do_check("fn main() { $0|x: i32| x * 2;}", "fn main() { |x: i32$0| x * 2;}");
+ do_check(
+ "fn func(x) { return (2 * (x + 3)$0) + 5;}",
+ "fn func(x) { return $0(2 * (x + 3)) + 5;}",
+ );
{
cov_mark::check!(pipes_not_braces);