Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1379 from zed-industries/fix-tab-panic

Browse source 
Handle inserting multiple tabs on the same row
This commit is contained in:
Antonio Scandurra 2022-07-16 08:51:33 +02:00 • committed by GitHub
commit ff1185062d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/editor/src/editor.rs
View file

@ -2909,9 +2909,17 @@ impl Editor {
if selections.iter().all(|s| s.is_empty()) { if selections.iter().all(|s| s.is_empty()) {
self.transact(cx, |this, cx| { self.transact(cx, |this, cx| {
this.buffer.update(cx, |buffer, cx| { this.buffer.update(cx, |buffer, cx| {
let mut prev_cursor_row = 0;
let mut row_delta = 0;
for selection in &mut selections { for selection in &mut selections {
let language_name = let mut cursor = selection.start;
buffer.language_at(selection.start, cx).map(|l| l.name()); if cursor.row != prev_cursor_row {
row_delta = 0;
prev_cursor_row = cursor.row;
}
cursor.column += row_delta;
let language_name = buffer.language_at(cursor, cx).map(|l| l.name());
let settings = cx.global::<Settings>(); let settings = cx.global::<Settings>();
let tab_size = if settings.hard_tabs(language_name.as_deref()) { let tab_size = if settings.hard_tabs(language_name.as_deref()) {
IndentSize::tab() IndentSize::tab()
@ -2919,21 +2927,18 @@ impl Editor {
let tab_size = settings.tab_size(language_name.as_deref()).get(); let tab_size = settings.tab_size(language_name.as_deref()).get();
let char_column = buffer let char_column = buffer
.read(cx) .read(cx)
.text_for_range(Point::new(selection.start.row, 0)..selection.start) .text_for_range(Point::new(cursor.row, 0)..cursor)
.flat_map(str::chars) .flat_map(str::chars)
.count(); .count();
let chars_to_next_tab_stop = tab_size - (char_column as u32 % tab_size); let chars_to_next_tab_stop = tab_size - (char_column as u32 % tab_size);
IndentSize::spaces(chars_to_next_tab_stop) IndentSize::spaces(chars_to_next_tab_stop)
}; };
buffer.edit( buffer.edit([(cursor..cursor, tab_size.chars().collect::<String>())], cx);
[( cursor.column += tab_size.len;
selection.start..selection.start, selection.start = cursor;
tab_size.chars().collect::<String>(), selection.end = cursor;
)],
cx, row_delta += tab_size.len;
);
selection.start.column += tab_size.len;
selection.end = selection.start;
} }
}); });
this.change_selections(Some(Autoscroll::Fit), cx, |s| { this.change_selections(Some(Autoscroll::Fit), cx, |s| {
@ -7566,6 +7571,27 @@ mod tests {
}); });
} }
#[gpui::test]
async fn test_tab(cx: &mut gpui::TestAppContext) {
let mut cx = EditorTestContext::new(cx).await;
cx.update(|cx| {
cx.update_global::<Settings, _, _>(|settings, _| {
settings.editor_overrides.tab_size = Some(NonZeroU32::new(3).unwrap());
});
});
cx.set_state(indoc! {"
|ab|c
|🏀|🏀|efg
d|
"});
cx.update_editor(|e, cx| e.tab(&Tab, cx));
cx.assert_editor_state(indoc! {"
|ab |c
|🏀 |🏀 |efg
d |
"});
}
#[gpui::test] #[gpui::test]
async fn test_indent_outdent(cx: &mut gpui::TestAppContext) { async fn test_indent_outdent(cx: &mut gpui::TestAppContext) {
let mut cx = EditorTestContext::new(cx).await; let mut cx = EditorTestContext::new(cx).await;