Skip to content

term: render Markdown tables without wrapping rows #16182

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

Open
fzlzjerry wants to merge 2 commits into
base: master
Choose a base branch
from
+642 −51
Open

term: render Markdown tables without wrapping rows #16182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c4b14
tui: support aligned cells and column separators
fzlzjerry Aug 13, 2026
31ff274
term: render markdown tables as separate blocks
fzlzjerry Aug 13, 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
17 changes: 8 additions & 9 deletions helix-term/src/ui/lsp/hover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use helix_lsp::lsp;
use helix_view::graphics::{Margin, Rect, Style};
use helix_view::input::Event;
use tui::buffer::Buffer;
use tui::widgets::{BorderType, Paragraph, Widget, Wrap};
use tui::widgets::{BorderType, Paragraph, Widget};

use crate::compositor::{Component, Context, EventResult};

Expand Down Expand Up @@ -95,16 +95,17 @@ impl Component for Hover {
}

// hover content
let contents = contents.parse(Some(&cx.editor.theme));
let contents_area = area.clip_top(if self.has_header() {
HEADER_HEIGHT + SEPARATOR_HEIGHT
} else {
0
});
let contents_para = Paragraph::new(&contents)
.wrap(Wrap { trim: false })
.scroll((cx.scroll.unwrap_or_default() as u16, 0));
contents_para.render(contents_area, surface);
contents.render_content(
contents_area,
surface,
Some(&cx.editor.theme),
cx.scroll.unwrap_or_default(),
);
}

fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
Expand All @@ -121,9 +122,7 @@ impl Component for Hover {
})
.unwrap_or_default();

let contents = contents.parse(None);
let (content_width, content_height) =
crate::ui::text::required_size(&contents, max_text_width);
let (content_width, content_height) = contents.required_size_for_width(max_text_width);

let width = PADDING_HORIZONTAL + header_width.max(content_width);
let height = if self.has_header() {
Expand Down
15 changes: 7 additions & 8 deletions helix-term/src/ui/lsp/signature_help.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,15 @@ impl Component for SignatureHelp {
None => return,
Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
};
let sig_doc = sig_doc.parse(Some(&cx.editor.theme));
let sig_doc_area = area
.clip_top(sig_text_area.height + 2)
.clip_bottom(u16::from(cx.editor.popup_border()));
let sig_doc_para = Paragraph::new(&sig_doc)
.wrap(Wrap { trim: false })
.scroll((cx.scroll.unwrap_or_default() as u16, 0));
sig_doc_para.render(sig_doc_area, surface);
sig_doc.render_content(
sig_doc_area,
surface,
Some(&cx.editor.theme),
cx.scroll.unwrap_or_default(),
);
}

fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
Expand All @@ -189,9 +190,7 @@ impl Component for SignatureHelp {
let (width, height) = match signature.signature_doc {
Some(ref doc) => {
let doc_md = Markdown::new(doc.clone(), Arc::clone(&self.config_loader));
let doc_text = doc_md.parse(None);
let (doc_width, doc_height) =
crate::ui::text::required_size(&doc_text, max_text_width);
let (doc_width, doc_height) = doc_md.required_size_for_width(max_text_width);
(
sig_width.max(doc_width),
sig_height + SEPARATOR_HEIGHT + doc_height,
Expand Down
Loading