Skip to content

repl: Render SVG cell outputs #62889

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
ArneshBanerjee wants to merge 1 commit into
base: main
Choose a base branch
from
+339 −38
Open

repl: Render SVG cell outputs #62889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion crates/gpui/src/svg_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{
AssetSource, DevicePixels, IsZero, RenderImage, Result, SharedString, Size,
AssetSource, DevicePixels, IsZero, Pixels, RenderImage, Result, SharedString, Size, px,
swap_rgba_pa_to_bgra,
};
use image::Frame;
Expand Down Expand Up @@ -102,6 +102,14 @@ pub struct SvgRenderer {
/// scales should retain this value to avoid re-paying the parse cost.
pub struct ParsedSvg(usvg::Tree);

impl ParsedSvg {
/// The intrinsic size of the document, in logical pixels.
pub fn size(&self) -> Size<Pixels> {
let size = self.0.size();
crate::size(px(size.width()), px(size.height()))
}
}

/// The size in which to rasterize the SVG.
#[derive(Clone, Copy)]
pub enum SvgSize {
Expand Down
26 changes: 17 additions & 9 deletions crates/repl/src/outputs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,12 @@ use settings::Settings;
/// When deciding what to render from a collection of mediatypes, we need to rank them in order of importance
fn rank_mime_type(mimetype: &MimeType) -> usize {
match mimetype {
MimeType::DataTable(_) => 7,
MimeType::Html(_) => 6,
MimeType::Json(_) => 5,
MimeType::DataTable(_) => 8,
MimeType::Html(_) => 7,
MimeType::Json(_) => 6,
// Rank SVG above raster images so a kernel that offers both is shown
// as the scalable version.
MimeType::Svg(_) => 5,
MimeType::Png(_) => 4,
MimeType::Jpeg(_) => 3,
MimeType::Markdown(_) => 2,
Expand Down Expand Up @@ -423,6 +426,10 @@ impl Output {
},
Err(error) => Output::Message(format!("Failed to load image: {}", error)),
},
Some(MimeType::Svg(data)) => Output::Image {
content: cx.new(|cx| ImageView::from_svg(data, cx)),
display_id,
},
Some(MimeType::DataTable(data)) => Output::Table {
content: cx.new(|cx| TableView::new(data, window, cx)),
display_id,
Expand Down Expand Up @@ -859,33 +866,34 @@ mod tests {
let data_table = MimeType::DataTable(Box::default());
let html = MimeType::Html(String::new());
let json = MimeType::Json(serde_json::json!({}));
let svg = MimeType::Svg(String::new());
let png = MimeType::Png(String::new());
let jpeg = MimeType::Jpeg(String::new());
let markdown = MimeType::Markdown(String::new());
let plain = MimeType::Plain(String::new());

assert_eq!(rank_mime_type(&data_table), 7);
assert_eq!(rank_mime_type(&html), 6);
assert_eq!(rank_mime_type(&json), 5);
assert_eq!(rank_mime_type(&data_table), 8);
assert_eq!(rank_mime_type(&html), 7);
assert_eq!(rank_mime_type(&json), 6);
assert_eq!(rank_mime_type(&svg), 5);
assert_eq!(rank_mime_type(&png), 4);
assert_eq!(rank_mime_type(&jpeg), 3);
assert_eq!(rank_mime_type(&markdown), 2);
assert_eq!(rank_mime_type(&plain), 1);

assert!(rank_mime_type(&data_table) > rank_mime_type(&html));
assert!(rank_mime_type(&html) > rank_mime_type(&json));
assert!(rank_mime_type(&json) > rank_mime_type(&png));
assert!(rank_mime_type(&json) > rank_mime_type(&svg));
assert!(rank_mime_type(&svg) > rank_mime_type(&png));
assert!(rank_mime_type(&png) > rank_mime_type(&jpeg));
assert!(rank_mime_type(&jpeg) > rank_mime_type(&markdown));
assert!(rank_mime_type(&markdown) > rank_mime_type(&plain));
}

#[test]
fn test_rank_mime_type_unsupported_returns_zero() {
let svg = MimeType::Svg(String::new());
let latex = MimeType::Latex(String::new());

assert_eq!(rank_mime_type(&svg), 0);
assert_eq!(rank_mime_type(&latex), 0);
}

Expand Down
Loading