Add multi selection support to UnwrapSyntaxNode (#35991)

Closes #35932
Closes #35933

I only intended to fix multi select in this, I accidentally drive-by
fixed the VIM issue as well. `replace_text_in_range` which I was using
before has two, to me unexpected, side-effects:
- it no-ops when input is disabled, which is the case in VIM's
Insert/Visual modes
- it takes the current selection into account, and does not just operate
on the given range (which I erroneously assumed before)

Now the code is using `buffer.edit` instead, which seems more lower
level, and does not have those side-effects. I was enthused to see that
it accepts a vec of edits, so I didn't have to calculate offsets for
following edits... until I also wanted to set selections, where I do
need to do it by hand. I'm still wondering if there is a simpler way to
do it, but for now it at least passes my muster

Release Notes:

- Added multiple selection support to UnwrapSyntaxNode action
- Fixed UnwrapSyntaxNode not working in VIM Insert/Visual modes
This commit is contained in:
Gregor
2025-08-19 01:01:46 +03:00
committed by GitHub
parent 9e0e233319
commit bb640c6a1c
2 changed files with 50 additions and 52 deletions
+4 -13
View File
@@ -8015,7 +8015,7 @@ async fn test_select_larger_smaller_syntax_node_for_string(cx: &mut TestAppConte
}
#[gpui::test]
async fn test_unwrap_syntax_node(cx: &mut gpui::TestAppContext) {
async fn test_unwrap_syntax_nodes(cx: &mut gpui::TestAppContext) {
init_test(cx, |_| {});
let mut cx = EditorTestContext::new(cx).await;
@@ -8029,21 +8029,12 @@ async fn test_unwrap_syntax_node(cx: &mut gpui::TestAppContext) {
buffer.set_language(Some(language), cx);
});
cx.set_state(
&r#"
use mod1::mod2::{«mod3ˇ», mod4};
"#
.unindent(),
);
cx.set_state(indoc! { r#"use mod1::{mod2::{«mod3ˇ», mod4}, mod5::{mod6, «mod7ˇ»}};"# });
cx.update_editor(|editor, window, cx| {
editor.unwrap_syntax_node(&UnwrapSyntaxNode, window, cx);
});
cx.assert_editor_state(
&r#"
use mod1::mod2::«mod3ˇ»;
"#
.unindent(),
);
cx.assert_editor_state(indoc! { r#"use mod1::{mod2::«mod3ˇ», mod5::«mod7ˇ»};"# });
}
#[gpui::test]