vim: Set current line as default sed command scope (#17234)

Closes #16977

Release Notes:
- added current line as default sed range to match vim's behavior
- changed tests accordingly

This also simplifies `ReplaceCommand` implementation by changing
`Option<CommandRange>` to `CommandRange` .
This commit is contained in:
Horam Zarri 2024-09-04 22:56:32 +03:30 committed by GitHub
parent 65bc1ea7c8
commit 694c912201
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 25 deletions

View File

@ -656,13 +656,11 @@ pub fn command_interceptor(mut input: &str, cx: &AppContext) -> Option<CommandIn
query.next();
}
if let Some(replacement) = Replacement::parse(query) {
Some(
ReplaceCommand {
replacement,
range: range.clone(),
}
.boxed_clone(),
)
let range = range.clone().unwrap_or(CommandRange {
start: Position::CurrentLine { offset: 0 },
end: None,
});
Some(ReplaceCommand { replacement, range }.boxed_clone())
} else {
None
}
@ -789,11 +787,13 @@ mod test {
cx.set_shared_state(indoc! {"
ˇa
b
b
c"})
.await;
cx.simulate_shared_keystrokes(": % s / b / d enter").await;
cx.shared_state().await.assert_eq(indoc! {"
a
d
ˇd
c"});
cx.simulate_shared_keystrokes(": % s : . : \\ 0 \\ 0 enter")
@ -801,7 +801,14 @@ mod test {
cx.shared_state().await.assert_eq(indoc! {"
aa
dd
dd
ˇcc"});
cx.simulate_shared_keystrokes("k : s / dd / ee enter").await;
cx.shared_state().await.assert_eq(indoc! {"
aa
dd
ˇee
cc"});
}
#[gpui::test]

View File

@ -42,7 +42,7 @@ pub struct FindCommand {
#[derive(Debug, Clone, PartialEq, Deserialize)]
pub struct ReplaceCommand {
pub(crate) range: Option<CommandRange>,
pub(crate) range: CommandRange,
pub(crate) replacement: Replacement,
}
@ -338,9 +338,8 @@ impl Vim {
else {
return;
};
if let Some(range) = &action.range {
if let Some(result) = self.update_editor(cx, |vim, editor, cx| {
let range = range.buffer_range(vim, editor, cx)?;
let range = action.range.buffer_range(vim, editor, cx)?;
let snapshot = &editor.snapshot(cx).buffer_snapshot;
let end_point = Point::new(range.end.0, snapshot.line_len(range.end));
let range = snapshot.anchor_before(Point::new(range.start.0, 0))
@ -352,7 +351,6 @@ impl Vim {
result.notify_err(workspace, cx);
})
}
}
let vim = cx.view().clone();
pane.update(cx, |pane, cx| {
let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() else {

View File

@ -1,4 +1,4 @@
{"Put":{"state":"ˇa\nb\nc"}}
{"Put":{"state":"ˇa\nb\nb\nc"}}
{"Key":":"}
{"Key":"%"}
{"Key":"s"}
@ -7,7 +7,7 @@
{"Key":"/"}
{"Key":"d"}
{"Key":"enter"}
{"Get":{"state":"a\nˇd\nc","mode":"Normal"}}
{"Get":{"state":"a\nd\nˇd\nc","mode":"Normal"}}
{"Key":":"}
{"Key":"%"}
{"Key":"s"}
@ -19,4 +19,13 @@
{"Key":"\\"}
{"Key":"0"}
{"Key":"enter"}
{"Get":{"state":"aa\ndd\nˇcc","mode":"Normal"}}
{"Get":{"state":"aa\ndd\ndd\nˇcc","mode":"Normal"}}
{"Key":"k"}
{"Key":":"}
{"Key":"s"}
{"Key":"/"}
{"Key":"dd"}
{"Key":"/"}
{"Key":"ee"}
{"Key":"enter"}
{"Get":{"state":"aa\ndd\nˇee\ncc", "mode":"Normal"}}