caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-06-15 00:26:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic when test source is not found in world (#6428)

Browse Source
This commit is contained in:
Tobias Schmitz 2025-06-11 12:19:41 +02:00 committed by GitHub
parent 71032c8349
commit d1c7757da8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/src/run.rs
View File

@ -10,7 +10,7 @@ use typst::layout::{Abs, Frame, FrameItem, PagedDocument, Transform};
use typst::visualize::Color;
use typst::{Document, WorldExt};
use typst_pdf::PdfOptions;
use typst_syntax::FileId;
use typst_syntax::{FileId, Lines};
use crate::collect::{Attr, FileSize, NoteKind, Test};
use crate::logger::TestResult;
@ -292,7 +292,7 @@ impl<'a> Runner<'a> {
return "(empty)".into();
}
let lines = self.world.lookup(file);
let lines = self.lookup(file);
lines.text()[range.clone()].replace('\n', "\\n").replace('\r', "\\r")
}
@ -318,7 +318,7 @@ impl<'a> Runner<'a> {
/// Display a position as a line:column pair.
fn format_pos(&self, file: FileId, pos: usize) -> String {
let lines = self.world.lookup(file);
let lines = self.lookup(file);
let res = lines.byte_to_line_column(pos).map(|(line, col)| (line + 1, col + 1));
let Some((line, col)) = res else {
@ -331,6 +331,15 @@ impl<'a> Runner<'a> {
format!("{line}:{col}")
}
}
#[track_caller]
fn lookup(&self, file: FileId) -> Lines<String> {
if self.test.source.id() == file {
self.test.source.lines().clone()
} else {
self.world.lookup(file)
}
}
}
/// An output type we can test.

2
tests/src/world.rs
View File

@ -88,7 +88,7 @@ impl TestWorld {
/// Lookup line metadata for a file by id.
#[track_caller]
pub fn lookup(&self, id: FileId) -> Lines<String> {
pub(crate) fn lookup(&self, id: FileId) -> Lines<String> {
self.slot(id, |slot| {
if let Some(source) = slot.source.get() {
let source = source.as_ref().expect("file is not valid");