Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

markdown preview: Fix panic when parsing empty image tag (#21616)

Browse source 
Closes #21534

While investigating the panic, I noticed that the code was pretty
complicated and decided to refactor parts of it to reduce redundancy.

Release Notes:

- Fixed an issue where the app could crash when opening the markdown
preview with a malformed image tag
This commit is contained in:
Bennet Bo Fenner 2024-12-06 10:01:57 +01:00 • committed by GitHub
parent f6b5e1734e
commit 7e40addb5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 104 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/markdown_preview/src/markdown_preview_view.rs
View file

@ -192,11 +192,16 @@ impl MarkdownPreviewView {
.group("markdown-block")
.on_click(cx.listener(move |this, event: &ClickEvent, cx| {
if event.down.click_count == 2 {
if let Some(block) =
this.contents.as_ref().and_then(|c| c.children.get(ix))
if let Some(source_range) = this
.contents
.as_ref()
.and_then(|c| c.children.get(ix))
.and_then(|block| block.source_range())
{
let start = block.source_range().start;
this.move_cursor_to_block(cx, start..start);
this.move_cursor_to_block(
cx,
source_range.start..source_range.start,
);
}
}
}))
@ -410,7 +415,9 @@ impl MarkdownPreviewView {
let mut last_end = 0;
if let Some(content) = &self.contents {
for (i, block) in content.children.iter().enumerate() {
let Range { start, end } = block.source_range();
let Some(Range { start, end }) = block.source_range() else {
continue;
};
// Check if the cursor is between the last block and the current block
if last_end <= cursor && cursor < start {