Skip to content

Hide markdown code block scrollbar when wrapped #58472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrSubidubi merged 4 commits into from
Jun 4, 2026
Merged

Hide markdown code block scrollbar when wrapped #58472

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a088b7
Hide markdown code block scrollbar when wrapped
albertbogusz Jun 3, 2026
815b7cc
Skip scroll handles for wrapped code blocks
albertbogusz Jun 3, 2026
3758eec
Add test
albertbogusz Jun 3, 2026
c8c2568
Simplify and cleanup
MrSubidubi Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 55 additions & 35 deletions crates/markdown/src/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,11 +611,13 @@ impl Markdown {
}
}

fn code_block_scroll_handle(&mut self, id: usize) -> ScrollHandle {
self.code_block_scroll_handles
.entry(id)
.or_insert_with(ScrollHandle::new)
.clone()
fn code_block_scroll_handle(&mut self, id: usize) -> Option<ScrollHandle> {
(!self.is_code_block_wrapped(id)).then(|| {
self.code_block_scroll_handles
.entry(id)
.or_insert_with(ScrollHandle::new)
.clone()
})
}

fn retain_code_block_scroll_handles(&mut self, ids: &HashSet<usize>) {
Expand Down Expand Up @@ -2139,13 +2141,15 @@ impl Element for MarkdownElement {

let is_indented = matches!(kind, CodeBlockKind::Indented);
let scroll_handle = if self.style.code_block_overflow_x_scroll {
code_block_ids.insert(range.start);
Some(self.markdown.update(cx, |markdown, _| {
self.markdown.update(cx, |markdown, _| {
markdown.code_block_scroll_handle(range.start)
}))
})
} else {
None
};
if scroll_handle.is_some() {
code_block_ids.insert(range.start);
}

match (&self.code_block_renderer, is_indented) {
(CodeBlockRenderer::Default { .. }, _) | (_, true) => {
Expand Down Expand Up @@ -2185,18 +2189,11 @@ impl Element for MarkdownElement {
parent_container.style().refine(&self.style.code_block);
builder.push_div(parent_container, range, markdown_end);

let is_wrapped =
self.markdown.read(cx).is_code_block_wrapped(range.start);

let code_block = div()
.id(("code-block", range.start))
.rounded_lg()
.map(|mut code_block| {
if is_wrapped {
code_block.w_full()
} else if let Some(scroll_handle) =
scroll_handle.as_ref()
{
if let Some(scroll_handle) = scroll_handle.as_ref() {
code_block.style().restrict_scroll_to_axis =
Some(true);
code_block
Expand Down Expand Up @@ -2477,7 +2474,7 @@ impl Element for MarkdownElement {
== WrapButtonVisibility::AlwaysVisible;
let use_hover = any_hover && !any_always;

let mut button_row = h_flex()
let button_row = h_flex()
.gap_0p5()
.absolute()
.bg(cx.theme().colors().editor_background)
Expand All @@ -2487,26 +2484,33 @@ impl Element for MarkdownElement {
this.top_1().right_1().visible_on_hover("code_block")
},
|this| this.top_1p5().right_1p5(),
)
.when(
wrap_button_visibility != WrapButtonVisibility::Hidden,
|this| {
let is_wrapped = self
.markdown
.read(cx)
.is_code_block_wrapped(range.start);

this.child(render_wrap_code_block_button(
range.start,
is_wrapped,
self.markdown.clone(),
))
},
)
.when(
copy_button_visibility != CopyButtonVisibility::Hidden,
|this| {
this.child(render_copy_code_block_button(
range.end,
code,
self.markdown.clone(),
))
},
);

if wrap_button_visibility != WrapButtonVisibility::Hidden {
let is_wrapped =
self.markdown.read(cx).is_code_block_wrapped(range.start);
button_row = button_row.child(render_wrap_code_block_button(
range.start,
is_wrapped,
self.markdown.clone(),
));
}

if copy_button_visibility != CopyButtonVisibility::Hidden {
button_row = button_row.child(render_copy_code_block_button(
range.end,
code,
self.markdown.clone(),
));
}

el.child(button_row)
});
}
Expand Down Expand Up @@ -3867,6 +3871,22 @@ mod tests {
render_markdown_with_language_registry(markdown, None, cx)
}

#[gpui::test]
fn test_wrapped_code_block_has_no_scroll_handle(cx: &mut TestAppContext) {
let markdown =
cx.new(|cx| Markdown::new("```rust\nlet value = 1;\n```".into(), None, None, cx));

markdown.update(cx, |markdown, _| {
assert!(markdown.code_block_scroll_handle(0).is_some());

markdown.toggle_code_block_wrap(0);
assert!(markdown.code_block_scroll_handle(0).is_none());

markdown.toggle_code_block_wrap(0);
assert!(markdown.code_block_scroll_handle(0).is_some());
});
}

#[gpui::test]
fn test_frontmatter_renders_without_delimiters(cx: &mut TestAppContext) {
let rendered = render_markdown_with_options(
Expand Down
Loading