From daed75096e98a4abdb95828e684d3e2089e050d3 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 9 Mar 2023 13:13:23 -0800 Subject: [PATCH] Fix editor test to clearly show trailing whitespace Adjsut default dock size to be a multiple of 16 --- crates/editor/src/editor_tests.rs | 16 ++++++++++------ styles/src/styleTree/workspace.ts | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs index d73c3c87db324aac0a47158c55bf10f705e48695..4f61bde39877bb0fb7ba40c0000077cf75c9fe82 100644 --- a/crates/editor/src/editor_tests.rs +++ b/crates/editor/src/editor_tests.rs @@ -2353,12 +2353,16 @@ async fn test_clipboard(cx: &mut gpui::TestAppContext) { e.paste(&Paste, cx); e.handle_input(") ", cx); }); - cx.assert_editor_state(indoc! {" - ( one✅ - three - five ) ˇtwo one✅ four three six five ( one✅ - three - five ) ˇ"}); + cx.assert_editor_state( + &([ + "( one✅ ", + "three ", + "five ) ˇtwo one✅ four three six five ( one✅ ", + "three ", + "five ) ˇ", + ] + .join("\n")), + ); // Cut with three selections, one of which is full-line. cx.set_state(indoc! {" diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index d798a22e9d65b18140e3664b9cb7bb2858ee9569..1789b523e7fdbb93ecd9a3cc14604079a7dc57e5 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -282,7 +282,7 @@ export default function workspace(colorScheme: ColorScheme) { }, dock: { initialSizeRight: 640, - initialSizeBottom: 300, + initialSizeBottom: 304, wash_color: withOpacity(background(colorScheme.highest), 0.5), panel: { border: border(colorScheme.middle),