From 9b9d279a490afe5ce7703847cc6b5d3c073ad4e5 Mon Sep 17 00:00:00 2001
From: Ian Wrzesinski <wrzian@umich.edu>
Date: Thu, 27 Feb 2025 10:50:49 -0500
Subject: [PATCH] eat trailing percent signs in numbers

---
 crates/typst-syntax/src/lexer.rs |   6 +-----
 tests/ref/double-percent.png     | Bin 496 -> 0 bytes
 tests/suite/layout/length.typ    |   5 +++++
 tests/suite/layout/relative.typ  |   9 ++++++---
 4 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 tests/ref/double-percent.png

diff --git a/crates/typst-syntax/src/lexer.rs b/crates/typst-syntax/src/lexer.rs
index a34b91add..e1b9c4999 100644
--- a/crates/typst-syntax/src/lexer.rs
+++ b/crates/typst-syntax/src/lexer.rs
@@ -871,11 +871,7 @@ impl Lexer<'_> {
         };
 
         // Read the suffix.
-        let suffix_start = self.s.cursor();
-        if !self.s.eat_if('%') {
-            self.s.eat_while(char::is_ascii_alphanumeric);
-        }
-        let suffix = self.s.from(suffix_start);
+        let suffix = self.s.eat_while(|c: char| c.is_ascii_alphanumeric() || c == '%');
         let maybe_suffix_result = match suffix {
             "" => None,
             "pt" | "mm" | "cm" | "in" | "deg" | "rad" | "em" | "fr" | "%" => Some(Ok(())),
diff --git a/tests/ref/double-percent.png b/tests/ref/double-percent.png
deleted file mode 100644
index 61a0d6143cd1615b0fa0051d0442b32be6fd2491..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq004LZ000{Z0{{R3fZDqh00036P)t-s|NsB~
z{QdLR<n-9(%ukE?>+=2f`SbJhrlzKag@yFj<nz?x{`&mXXq)S}(A908^3vhidZ+sB
z^UFzx;+eecywmN!)#94G#yES$HhSNVw3CyQ{QUgNMuo&Oc>3(}_~!2H?CkmK@#wC}
z)^MQTk+#!kn$&BZ+=Z^zaiQj?#p$ujwY9a5j*hIXtmfwC)^eiSeW~fQ&FJXp>gwu|
zk&(y8$MMbHoSdBU^75mjqwT@g;g-6}%F6cO>gu-7`||eg?(V$2yr7_<{{H@khK6)>
zbh5It#KgqGDRSzy&iUx@&|Q?$VwdpA+xFh+_xJby`~2XNx8aw%>a@-K@b&-x{>PGM
zX#fBKrb$FWRCwC$(?t%$KoCUHa+sN!nVFdxY~TMVk>bQRm`IWOt-g9ws|F#2{4<T)
z!+p|V{2p(B7K|xeUY}GJvkH@J2Eb;m)9b(-=f6v#R$*GqbBTDl5(<L3!#)6cSS;ky
zNtCL+K7Jq^m4}5<x0VvI8xPt|uyqxVkr)&Yz+`YbfMKIPn=i5Hw7}NoeBuG+6R=sW
mc0hdcSgf$!(Zdr$$lD7Fxe*U>FP1O>0000<MNUMnLSTZ(v?)OV

diff --git a/tests/suite/layout/length.typ b/tests/suite/layout/length.typ
index cd7745c83..1fd6452fb 100644
--- a/tests/suite/layout/length.typ
+++ b/tests/suite/layout/length.typ
@@ -107,7 +107,12 @@
 #1.2e-0%
 #0.0e0deg
 #0.%
+// Error: 2-6 invalid number suffix: in%
+// Hint: 2-6 try adding a space after: `in`
 #5in%
+// Error: 2-6 invalid number suffix: %in
+// Hint: 2-6 try adding a space after: `%`
+#5%in
 // Error: 2-8 invalid number suffix: hello
 #1hello
 // Error: 2-7 invalid number suffix: infr
diff --git a/tests/suite/layout/relative.typ b/tests/suite/layout/relative.typ
index 5a5908920..13c12162e 100644
--- a/tests/suite/layout/relative.typ
+++ b/tests/suite/layout/relative.typ
@@ -6,10 +6,13 @@
 #test((100% + 2pt - 2pt).length, 0pt)
 #test((56% + 2pt - 56%).ratio, 0%)
 
---- double-percent ---
+--- double-percent-embedded ---
 // Test for two percent signs in a row.
+// Error: 2-7 invalid number suffix: %%
+// Hint: 2-7 try adding a space after: `%`
 #3.1%%
 
---- double-percent-error ---
-// Error: 7-8 the character `%` is not valid in code
+--- double-percent-parens ---
+// Error: 3-8 invalid number suffix: %%
+// Hint: 3-8 try adding a space after: `%`
 #(3.1%%)