mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 12:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

vim: Fix readonly mode (#20264)

Browse source 
Closes #18854

Release Notes:

- vim: Fixed `r`, `~` etc. appearing to modify readonly buffers
This commit is contained in:
Conrad Irwin 2024-11-05 21:45:45 -07:00 committed by GitHub
parent c10c35ffda
commit 803e5d4c9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/vim/src/normal.rs
View file

@ -439,9 +439,7 @@ impl Vim {
))
}
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.set_clip_at_line_ends(true, cx);
editor.change_selections(None, cx, |s| {
s.move_with(|map, selection| {

15
crates/vim/src/normal/case.rs
View file

@ -163,15 +163,12 @@ impl Vim {
editor.transact(cx, |editor, cx| {
for range in ranges.into_iter().rev() {
let snapshot = editor.buffer().read(cx).snapshot(cx);
editor.buffer().update(cx, |buffer, cx| {
let text = snapshot
.text_for_range(range.start..range.end)
.flat_map(|s| s.chars())
.flat_map(transform)
.collect::<String>();
buffer.edit([(range, text)], None, cx)
})
let text = snapshot
.text_for_range(range.start..range.end)
.flat_map(|s| s.chars())
.flat_map(transform)
.collect::<String>();
editor.edit([(range, text)], cx)
}
editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_ranges(cursor_positions)

16
crates/vim/src/replace.rs
View file

@ -5,7 +5,7 @@ use crate::{
};
use editor::{display_map::ToDisplayPoint, Bias, Editor, ToPoint};
use gpui::{actions, ViewContext};
use language::{AutoindentMode, Point};
use language::Point;
use std::ops::Range;
use std::sync::Arc;
@ -58,15 +58,7 @@ impl Vim {
})
.collect::<Vec<_>>();
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(
edits.clone(),
Some(AutoindentMode::Block {
original_indent_columns: Vec::new(),
}),
cx,
);
});
editor.edit_with_block_indent(edits.clone(), Vec::new(), cx);
editor.change_selections(None, cx, |s| {
s.select_anchor_ranges(edits.iter().map(|(range, _)| range.end..range.end));
@ -113,9 +105,7 @@ impl Vim {
})
.collect::<Vec<_>>();
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.change_selections(None, cx, |s| {
s.select_ranges(new_selections);

12
crates/vim/src/surrounds.rs
View file

@ -119,9 +119,7 @@ impl Vim {
}
}
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.set_clip_at_line_ends(true, cx);
editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
if mode == Mode::VisualBlock {
@ -220,9 +218,7 @@ impl Vim {
s.select_ranges(anchors);
});
edits.sort_by_key(|(range, _)| range.start);
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.set_clip_at_line_ends(true, cx);
});
});
@ -320,9 +316,7 @@ impl Vim {
})
.collect::<Vec<_>>();
edits.sort_by_key(|(range, _)| range.start);
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.set_clip_at_line_ends(true, cx);
editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_anchor_ranges(stable_anchors);

4
crates/vim/src/visual.rs
View file

@ -530,9 +530,7 @@ impl Vim {
}
}
editor.buffer().update(cx, |buffer, cx| {
buffer.edit(edits, None, cx);
});
editor.edit(edits, cx);
editor.change_selections(None, cx, |s| s.select_ranges(stable_anchors));
});
});