fix match bracket matching (#10777)
This commit is contained in:
parent
889bbefeb3
commit
2301430e37
2 changed files with 18 additions and 2 deletions
|
@ -87,13 +87,13 @@ fn find_pair(
|
||||||
(as_char(doc, &open), as_char(doc, &close))
|
(as_char(doc, &open), as_char(doc, &close))
|
||||||
{
|
{
|
||||||
if PAIRS.contains(&(open, close)) {
|
if PAIRS.contains(&(open, close)) {
|
||||||
if start_pos == pos_ {
|
if end_pos == pos_ {
|
||||||
return Some(start_pos);
|
return Some(start_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
// We return the end char if the cursor is either on the start char
|
// We return the end char if the cursor is either on the start char
|
||||||
// or at some arbitrary position between start and end char.
|
// or at some arbitrary position between start and end char.
|
||||||
if traverse_parents || end_pos == pos_ {
|
if traverse_parents || start_pos == pos_ {
|
||||||
return Some(end_pos);
|
return Some(end_pos);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -895,6 +895,22 @@ async fn match_bracket() -> anyhow::Result<()> {
|
||||||
}
|
}
|
||||||
"##},
|
"##},
|
||||||
),
|
),
|
||||||
|
// named node with 2 or more children
|
||||||
|
(
|
||||||
|
indoc! {r##"
|
||||||
|
use a::#[{|]#
|
||||||
|
b::{c, d, e, f, g},
|
||||||
|
h, i, j, k, l, m, n,
|
||||||
|
};
|
||||||
|
"##},
|
||||||
|
"mm",
|
||||||
|
indoc! {r##"
|
||||||
|
use a::{
|
||||||
|
b::{c, d, e, f, g},
|
||||||
|
h, i, j, k, l, m, n,
|
||||||
|
#[}|]#;
|
||||||
|
"##},
|
||||||
|
),
|
||||||
];
|
];
|
||||||
|
|
||||||
let python_tests = vec![
|
let python_tests = vec![
|
||||||
|
|
Loading…
Add table
Reference in a new issue