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

Fix relative indentation when pasting content copied from outside Zed (#25300)

Browse source 
Closes https://github.com/zed-industries/zed/issues/24914

Release Notes:

- Fixed incorrect indentation when pasting multi-line content that was
copied from another app.
This commit is contained in:
Max Brunsfeld 2025-02-20 17:25:33 -08:00 • committed by GitHub
parent ee1a559827
commit c31c638006
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 233 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/vim/src/normal/paste.rs
View file

@ -81,32 +81,32 @@ impl Vim {
}
}
let first_selection_indent_column =
let first_selection_start_column =
clipboard_selections.as_ref().and_then(|zed_selections| {
zed_selections
.first()
.map(|selection| selection.first_line_indent)
.map(|selection| selection.start_column)
});
let before = action.before || vim.mode == Mode::VisualLine;
let mut edits = Vec::new();
let mut new_selections = Vec::new();
let mut original_indent_columns = Vec::new();
let mut original_start_columns = Vec::new();
let mut start_offset = 0;
for (ix, (selection, preserve)) in selections_to_process.iter().enumerate() {
let (mut to_insert, original_indent_column) =
let (mut to_insert, original_start_column) =
if let Some(clipboard_selections) = &clipboard_selections {
if let Some(clipboard_selection) = clipboard_selections.get(ix) {
let end_offset = start_offset + clipboard_selection.len;
let text = text[start_offset..end_offset].to_string();
start_offset = end_offset + 1;
(text, Some(clipboard_selection.first_line_indent))
(text, Some(clipboard_selection.start_column))
} else {
("".to_string(), first_selection_indent_column)
("".to_string(), first_selection_start_column)
}
} else {
(text.to_string(), first_selection_indent_column)
(text.to_string(), first_selection_start_column)
};
let line_mode = to_insert.ends_with('\n');
let is_multiline = to_insert.contains('\n');
@ -152,10 +152,10 @@ impl Vim {
new_selections.push((anchor, line_mode, is_multiline));
}
edits.push((point_range, to_insert.repeat(count)));
original_indent_columns.extend(original_indent_column);
original_start_columns.extend(original_start_column);
}
editor.edit_with_block_indent(edits, original_indent_columns, cx);
editor.edit_with_block_indent(edits, original_start_columns, cx);
// in line_mode vim will insert the new text on the next (or previous if before) line
// and put the cursor on the first non-blank character of the first inserted line (or at the end if the first line is blank).

2
crates/vim/src/normal/yank.rs
View file

@ -188,7 +188,7 @@ impl Vim {
clipboard_selections.push(ClipboardSelection {
len: text.len() - initial_len,
is_entire_line: linewise,
first_line_indent: buffer.indent_size_for_line(MultiBufferRow(start.row)).len,
start_column: start.column,
});
}
}