caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-08-24 19:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't use LineCol in test code since it's not available with --no-default-features

Browse Source
This commit is contained in:
Tobias Schmitz 2025-05-20 15:38:06 +02:00
parent 8e9e8a753c
commit 702fa063a1
No known key found for this signature in database
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/src/collect.rs
View File

@ -6,7 +6,6 @@ use std::str::FromStr;
use std::sync::LazyLock; use std::sync::LazyLock;
use ecow::{eco_format, EcoString}; use ecow::{eco_format, EcoString};
use typst::diag::LineCol;
use typst_syntax::package::PackageVersion; use typst_syntax::package::PackageVersion;
use typst_syntax::{ use typst_syntax::{
is_id_continue, is_ident, is_newline, FileId, Lines, Source, VirtualPath, is_id_continue, is_ident, is_newline, FileId, Lines, Source, VirtualPath,
@ -413,14 +412,13 @@ impl<'a> Parser<'a> {
let start = self.parse_line_col()?; let start = self.parse_line_col()?;
let lines = Lines::from_bytes(text.as_ref()).expect("Errors shouldn't be annotated for files that aren't human readable (not valid utf-8)"); let lines = Lines::from_bytes(text.as_ref()).expect("Errors shouldn't be annotated for files that aren't human readable (not valid utf-8)");
let range = if self.s.eat_if('-') { let range = if self.s.eat_if('-') {
let end = self.parse_line_col()?; let (line, col) = start;
let (line, col) = start.indices();
let start = lines.line_column_to_byte(line, col); let start = lines.line_column_to_byte(line, col);
let (line, col) = end.indices(); let (line, col) = self.parse_line_col()?;
let end = lines.line_column_to_byte(line, col); let end = lines.line_column_to_byte(line, col);
Option::zip(start, end).map(|(a, b)| a..b) Option::zip(start, end).map(|(a, b)| a..b)
} else { } else {
let (line, col) = start.indices(); let (line, col) = start;
lines.line_column_to_byte(line, col).map(|i| i..i) lines.line_column_to_byte(line, col).map(|i| i..i)
}; };
if range.is_none() { if range.is_none() {
@ -429,8 +427,8 @@ impl<'a> Parser<'a> {
range range
} }
/// Parses an absolute `line:column` position in an external file. /// Parses absolute `line:column` indices in an external file.
fn parse_line_col(&mut self) -> Option<LineCol> { fn parse_line_col(&mut self) -> Option<(usize, usize)> {
let line = self.parse_number()?; let line = self.parse_number()?;
if !self.s.eat_if(':') { if !self.s.eat_if(':') {
self.error("positions in external files always require both `<line>:<col>`"); self.error("positions in external files always require both `<line>:<col>`");
@ -442,7 +440,7 @@ impl<'a> Parser<'a> {
return None; return None;
} }
Some(LineCol::one_based(line as usize, col as usize)) Some(((line as usize).saturating_sub(1), (col as usize).saturating_sub(1)))
} }
/// Parse a range, optionally abbreviated as just a position if the range /// Parse a range, optionally abbreviated as just a position if the range