mirror of
https://github.com/zed-industries/zed.git
synced 2026-08-26 17:42:21 +00:00
828544342d
# Objective - Fixes #25905 - Regex search-and-replace silently does nothing when a same-line pattern contains a lookahead or lookbehind. Searching highlights the correct hits, but Replace All or `:s` in Vim mode leaves the buffer untouched. Reproduce with `316227766016837933199`, search `(\d)(?=(\d{4})+$)` in regex mode, and replace with `$1,`. Expected: `3,1622,7766,0168,3793,3199`. Actual before this change: nothing changes. The same problem affects `(?<=foo: )bar` replaced with `BAZ`. `SearchQuery::replacement_for` expanded the replacement by re-running the whole pattern against the matched text alone. Lookaround assertions inspect text outside the match, so the isolated hit no longer matched and the edit replaced the hit with itself. ## Solution - `replacement_for` now expands from captures located at the exact hit range within its source context. - Single-line regex hits use the complete source line, so lookahead, lookbehind, and line anchors see the same surrounding text used by search. - Literal and escaped-regex searches bypass context reconstruction because their replacements do not use captures. - Multi-line hits retain the exact matched text, preserving the prior cross-line behavior. - If selection boundaries prevent the pattern from matching the reconstructed line, replacement falls back to the isolated hit, preserving prior behavior. - Replace All caches the source line across hits on the same line. Cross-line lookaround remains unchanged: assertions that need text outside a multi-line hit still produce a no-op replacement. Search-within-selection can also retain the prior no-op behavior when the selection boundary changes assertion context. ## Testing - `cargo test -p search test_replace_with_lookaround` (2 passed) - `cargo fmt --all -- --check` - `./script/clippy -p editor -p project -p search` - Tested on Linux arm64. The change is platform independent. ## Self-Review Checklist: - [x] I have reviewed the diff for quality, security, and reliability - [x] Unsafe blocks, if any, have justifying comments - [x] The content adheres to Zed UI standards - [x] Tests cover the changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - Fixed same-line regex replacements that use lookahead or lookbehind |
||
|---|---|---|
| .. | ||
| context_server_store | ||
| debugger | ||
| git_store | ||
| lsp_command | ||
| lsp_store | ||
| manifest_tree | ||
| agent_registry_store.rs | ||
| agent_server_store.rs | ||
| bookmark_store.rs | ||
| buffer_store.rs | ||
| color_extractor.rs | ||
| connection_manager.rs | ||
| context_server_store.rs | ||
| debounced_delay.rs | ||
| debugger.rs | ||
| environment.rs | ||
| git_store.rs | ||
| image_store.rs | ||
| lsp_command.rs | ||
| lsp_store.rs | ||
| manifest_tree.rs | ||
| prettier_store.rs | ||
| project.rs | ||
| project_search.rs | ||
| project_settings.rs | ||
| search.rs | ||
| search_history.rs | ||
| task_inventory.rs | ||
| task_store.rs | ||
| telemetry_snapshot.rs | ||
| terminals.rs | ||
| toolchain_store.rs | ||
| trusted_worktrees.rs | ||
| worktree_store.rs | ||
| yarn.rs | ||