From ad94642e8327d237169ac98796beae9bb06e628a Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 4 Mar 2025 12:24:08 -0500 Subject: [PATCH] markdown: Fix code block wrapping when horizontal scrolling is disabled (#26048) This PR fixes an issue where code block wrapping was broken when not using horizontal scrolling after https://github.com/zed-industries/zed/pull/25956. Release Notes: - N/A --- crates/markdown/src/markdown.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs index 16abeb4233..c160b647cb 100644 --- a/crates/markdown/src/markdown.rs +++ b/crates/markdown/src/markdown.rs @@ -613,11 +613,14 @@ impl Element for MarkdownElement { let mut code_block = div() .id(("code-block", range.start)) - .flex() .rounded_lg() - .when(self.style.code_block_overflow_x_scroll, |mut code_block| { - code_block.style().restrict_scroll_to_axis = Some(true); - code_block.overflow_x_scroll() + .map(|mut code_block| { + if self.style.code_block_overflow_x_scroll { + code_block.style().restrict_scroll_to_axis = Some(true); + code_block.flex().overflow_x_scroll() + } else { + code_block.w_full() + } }); code_block.style().refine(&self.style.code_block); if let Some(code_block_text_style) = &self.style.code_block.text {