Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

proposal: support matching inside string literals #7640

Closed
wants to merge 2 commits into from
Closed

proposal: support matching inside string literals #7640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024ebe1
fix: make find_matching_bracket_fuzzy behaviour consistent
alevinval Jul 15, 2023
ad8f086
discussion: if we did that, we would make the behaviour of matching c…
alevinval Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions helix-core/src/match_brackets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Opt
//
// If no surrounding scope is found, the function returns `None`.
#[must_use]
pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
find_pair(syntax, doc, pos, true)
pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos_: usize) -> Option<usize> {
let pos = doc.char_to_byte(pos_);
let traverse_parents = !is_valid_bracket(doc.char(pos));
find_pair(syntax, doc, pos_, traverse_parents)
}

fn find_pair(
Expand Down Expand Up @@ -115,9 +117,6 @@ fn find_pair(
node = parent;
}
let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
if node.child_count() != 0 {
return None;
}
let node_start = doc.byte_to_char(node.start_byte());
find_matching_bracket_plaintext(doc.byte_slice(node.byte_range()), pos_ - node_start)
.map(|pos| pos + node_start)
Expand Down