bendns' repos / helix
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-term/src/commands.rs')
-rw-r--r--helix-term/src/commands.rs53
1 files changed, 32 insertions, 21 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index cc7b84c4..8610a204 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5409,13 +5409,22 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
'e' => textobject_treesitter("entry", range),
'p' => textobject::textobject_paragraph(text, range, objtype, count),
'm' => textobject::textobject_pair_surround_closest(
- text, range, objtype, count,
+ doc.syntax(),
+ text,
+ range,
+ objtype,
+ count,
),
'g' => textobject_change(range),
// TODO: cancel new ranges if inconsistent surround matches across lines
- ch if !ch.is_ascii_alphanumeric() => {
- textobject::textobject_pair_surround(text, range, objtype, ch, count)
- }
+ ch if !ch.is_ascii_alphanumeric() => textobject::textobject_pair_surround(
+ doc.syntax(),
+ text,
+ range,
+ objtype,
+ ch,
+ count,
+ ),
_ => range,
}
});
@@ -5440,7 +5449,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
("c", "Comment (tree-sitter)"),
("T", "Test (tree-sitter)"),
("e", "Data structure entry (tree-sitter)"),
- ("m", "Closest surrounding pair"),
+ ("m", "Closest surrounding pair (tree-sitter)"),
("g", "Change"),
(" ", "... or any character acting as a pair"),
];
@@ -5454,7 +5463,7 @@ fn surround_add(cx: &mut Context) {
// surround_len is the number of new characters being added.
let (open, close, surround_len) = match event.char() {
Some(ch) => {
- let (o, c) = surround::get_pair(ch);
+ let (o, c) = match_brackets::get_pair(ch);
let mut open = Tendril::new();
open.push(o);
let mut close = Tendril::new();
@@ -5505,13 +5514,14 @@ fn surround_replace(cx: &mut Context) {
let text = doc.text().slice(..);
let selection = doc.selection(view.id);
- let change_pos = match surround::get_surround_pos(text, selection, surround_ch, count) {
- Ok(c) => c,
- Err(err) => {
- cx.editor.set_error(err.to_string());
- return;
- }
- };
+ let change_pos =
+ match surround::get_surround_pos(doc.syntax(), text, selection, surround_ch, count) {
+ Ok(c) => c,
+ Err(err) => {
+ cx.editor.set_error(err.to_string());
+ return;
+ }
+ };
let selection = selection.clone();
let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
@@ -5526,7 +5536,7 @@ fn surround_replace(cx: &mut Context) {
Some(to) => to,
None => return doc.set_selection(view.id, selection),
};
- let (open, close) = surround::get_pair(to);
+ let (open, close) = match_brackets::get_pair(to);
// the changeset has to be sorted to allow nested surrounds
let mut sorted_pos: Vec<(usize, char)> = Vec::new();
@@ -5563,13 +5573,14 @@ fn surround_delete(cx: &mut Context) {
let text = doc.text().slice(..);
let selection = doc.selection(view.id);
- let mut change_pos = match surround::get_surround_pos(text, selection, surround_ch, count) {
- Ok(c) => c,
- Err(err) => {
- cx.editor.set_error(err.to_string());
- return;
- }
- };
+ let mut change_pos =
+ match surround::get_surround_pos(doc.syntax(), text, selection, surround_ch, count) {
+ Ok(c) => c,
+ Err(err) => {
+ cx.editor.set_error(err.to_string());
+ return;
+ }
+ };
change_pos.sort_unstable(); // the changeset has to be sorted to allow nested surrounds
let transaction =
Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));