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

Introduce AutoindentMode parameter to Buffer::edit

Browse source 
This controls whether or not we preserve the relative indentation
of inserted text blocks.

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
This commit is contained in:
Max Brunsfeld 2022-07-28 14:03:31 -07:00
parent cdf6ae25bb
commit fa5af4383d
18 changed files with 308 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/zed/src/languages/rust.rs
View file

@ -444,29 +444,29 @@ mod tests {
// indent between braces
buffer.set_text("fn a() {}", cx);
let ix = buffer.len() - 1;
buffer.edit_with_autoindent([(ix..ix, "\n\n")], cx);
buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::Independent), cx);
assert_eq!(buffer.text(), "fn a() {\n \n}");
// indent between braces, even after empty lines
buffer.set_text("fn a() {\n\n\n}", cx);
let ix = buffer.len() - 2;
buffer.edit_with_autoindent([(ix..ix, "\n")], cx);
buffer.edit([(ix..ix, "\n")], Some(AutoindentMode::Independent), cx);
assert_eq!(buffer.text(), "fn a() {\n\n\n \n}");
// indent a line that continues a field expression
buffer.set_text("fn a() {\n \n}", cx);
let ix = buffer.len() - 2;
buffer.edit_with_autoindent([(ix..ix, "b\n.c")], cx);
buffer.edit([(ix..ix, "b\n.c")], Some(AutoindentMode::Independent), cx);
assert_eq!(buffer.text(), "fn a() {\n b\n .c\n}");
// indent further lines that continue the field expression, even after empty lines
let ix = buffer.len() - 2;
buffer.edit_with_autoindent([(ix..ix, "\n\n.d")], cx);
buffer.edit([(ix..ix, "\n\n.d")], Some(AutoindentMode::Independent), cx);
assert_eq!(buffer.text(), "fn a() {\n b\n .c\n \n .d\n}");
// dedent the line after the field expression
let ix = buffer.len() - 2;
buffer.edit_with_autoindent([(ix..ix, ";\ne")], cx);
buffer.edit([(ix..ix, ";\ne")], Some(AutoindentMode::Independent), cx);
assert_eq!(
buffer.text(),
"fn a() {\n b\n .c\n \n .d;\n e\n}"
@ -475,17 +475,21 @@ mod tests {
// indent inside a struct within a call
buffer.set_text("const a: B = c(D {});", cx);
let ix = buffer.len() - 3;
buffer.edit_with_autoindent([(ix..ix, "\n\n")], cx);
buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::Independent), cx);
assert_eq!(buffer.text(), "const a: B = c(D {\n \n});");
// indent further inside a nested call
let ix = buffer.len() - 4;
buffer.edit_with_autoindent([(ix..ix, "e: f(\n\n)")], cx);
buffer.edit(
[(ix..ix, "e: f(\n\n)")],
Some(AutoindentMode::Independent),
cx,
);
assert_eq!(buffer.text(), "const a: B = c(D {\n e: f(\n \n )\n});");
// keep that indent after an empty line
let ix = buffer.len() - 8;
buffer.edit_with_autoindent([(ix..ix, "\n")], cx);
buffer.edit([(ix..ix, "\n")], Some(AutoindentMode::Independent), cx);
assert_eq!(
buffer.text(),
"const a: B = c(D {\n e: f(\n \n \n )\n});"