mirror of
https://github.com/zed-industries/zed.git
synced 2026-06-01 03:14:56 +07:00
Fix vim replace not escaping $ (#53277)
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes ##42292 The text inserted in the search ('\$SEARCH') and replace ('$$OTHER') inputs of the top-panel is a little anti-aesthetic, but that seems out of scope for this issue. Release Notes: - '$' in the second clause of vim-style '%s/find/replace/g' actions is correctly escaped. Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
parent
f506d16128
commit
663bc9dd35
2 changed files with 66 additions and 1 deletions
|
|
@ -669,7 +669,9 @@ impl Replacement {
|
|||
// convert a vim query into something more usable by zed.
|
||||
// we don't attempt to fully convert between the two regex syntaxes,
|
||||
// but we do flip \( and \) to ( and ) (and vice-versa) in the pattern,
|
||||
// and convert \0..\9 to $0..$9 in the replacement so that common idioms work.
|
||||
// convert \0..\9 to $0..$9 in the replacement so that common idioms work,
|
||||
// and escape literal `$` to `$$` in the replacement so vim's literal `$`
|
||||
// is not interpreted as a Rust regex capture-group reference.
|
||||
pub(crate) fn parse(mut chars: Peekable<Chars>) -> Option<Replacement> {
|
||||
let delimiter = chars
|
||||
.next()
|
||||
|
|
@ -692,6 +694,9 @@ impl Replacement {
|
|||
escaped = false;
|
||||
if phase == 1 && c.is_ascii_digit() {
|
||||
buffer.push('$')
|
||||
} else if phase == 1 && c == '$' {
|
||||
// Second '$' escapes by fallthrough
|
||||
buffer.push('$')
|
||||
// unescape escaped parens
|
||||
} else if phase == 0 && (c == '(' || c == ')') {
|
||||
} else if c != delimiter {
|
||||
|
|
@ -714,6 +719,10 @@ impl Replacement {
|
|||
// escape unescaped parens
|
||||
if phase == 0 && (c == '(' || c == ')') {
|
||||
buffer.push('\\')
|
||||
} else if phase == 1 && c == '$' {
|
||||
// '$' is not special in the replacement clause,
|
||||
// so we also escape here.
|
||||
buffer.push('$')
|
||||
}
|
||||
buffer.push(c)
|
||||
}
|
||||
|
|
@ -757,6 +766,16 @@ mod test {
|
|||
use search::BufferSearchBar;
|
||||
use settings::SettingsStore;
|
||||
|
||||
#[test]
|
||||
fn test_replacement_parse_escaped_dollar() {
|
||||
let parsed = super::Replacement::parse(r"/\$test/\$rest/g".chars().peekable())
|
||||
.expect("parse should succeed");
|
||||
|
||||
assert_eq!(parsed.search, r"\$test");
|
||||
assert_eq!(parsed.replacement, "$$rest");
|
||||
assert!(parsed.flag_g);
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_move_to_next(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = VimTestContext::new(cx, true).await;
|
||||
|
|
@ -1182,6 +1201,27 @@ mod test {
|
|||
})
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_replace_literal_dollar(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = NeovimBackedTestContext::new(cx).await;
|
||||
cx.set_shared_state(indoc! {
|
||||
"ˇBase=hello
|
||||
echo $Base"
|
||||
})
|
||||
.await;
|
||||
|
||||
cx.simulate_shared_keystrokes(
|
||||
": % s / \\ $ shift-b a s e / \\ $ shift-b a s e shift-n e w / g",
|
||||
)
|
||||
.await;
|
||||
cx.simulate_shared_keystrokes("enter").await;
|
||||
|
||||
cx.shared_state().await.assert_eq(indoc! {
|
||||
"Base=hello
|
||||
ˇecho $BaseNew"
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_replace_g(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = NeovimBackedTestContext::new(cx).await;
|
||||
|
|
|
|||
25
crates/vim/test_data/test_replace_literal_dollar.json
Normal file
25
crates/vim/test_data/test_replace_literal_dollar.json
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{"Put":{"state":"ˇBase=hello\necho $Base"}}
|
||||
{"Key":":"}
|
||||
{"Key":"%"}
|
||||
{"Key":"s"}
|
||||
{"Key":"/"}
|
||||
{"Key":"\\"}
|
||||
{"Key":"$"}
|
||||
{"Key":"shift-b"}
|
||||
{"Key":"a"}
|
||||
{"Key":"s"}
|
||||
{"Key":"e"}
|
||||
{"Key":"/"}
|
||||
{"Key":"\\"}
|
||||
{"Key":"$"}
|
||||
{"Key":"shift-b"}
|
||||
{"Key":"a"}
|
||||
{"Key":"s"}
|
||||
{"Key":"e"}
|
||||
{"Key":"shift-n"}
|
||||
{"Key":"e"}
|
||||
{"Key":"w"}
|
||||
{"Key":"/"}
|
||||
{"Key":"g"}
|
||||
{"Key":"enter"}
|
||||
{"Get":{"state":"Base=hello\nˇecho $BaseNew","mode":"Normal"}}
|
||||
Loading…
Reference in a new issue