From d3b62bd02ef92b747b724f344e9b8c7d5668ffbe Mon Sep 17 00:00:00 2001
From: bluebear94 <uruwi@protonmail.com>
Date: Thu, 12 Oct 2023 04:19:07 -0400
Subject: [PATCH] MathAttach::primes: account for possible hash before base
 (#2363)

Fixes #2358.
---
 crates/typst-syntax/src/ast.rs |   6 +++++-
 tests/ref/math/prime.png       | Bin 0 -> 1248 bytes
 tests/typ/math/prime.typ       |   9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/math/prime.png
 create mode 100644 tests/typ/math/prime.typ

diff --git a/crates/typst-syntax/src/ast.rs b/crates/typst-syntax/src/ast.rs
index 83e4ff9cf..f411326f6 100644
--- a/crates/typst-syntax/src/ast.rs
+++ b/crates/typst-syntax/src/ast.rs
@@ -863,7 +863,11 @@ impl<'a> MathAttach<'a> {
 
     /// Extract attached primes if present.
     pub fn primes(self) -> Option<MathPrimes<'a>> {
-        self.0.children().nth(1).and_then(|n| n.cast())
+        self.0
+            .children()
+            .skip_while(|node| node.cast::<Expr<'_>>().is_none())
+            .nth(1)
+            .and_then(|n| n.cast())
     }
 }
 
diff --git a/tests/ref/math/prime.png b/tests/ref/math/prime.png
new file mode 100644
index 0000000000000000000000000000000000000000..81a4764367a14c501178fec1756076d6a519793a
GIT binary patch
literal 1248
zcmeAS@N?(olHy`uVBq!ia0y~yU}OQZ`#FFFgJtrsN(Kg&<(@8%Ar-gY-n|<fQYv%&
zqcOXPj*vE+et`?8F>mStr{1EbsUqHDM!B0c(&h+t%`|e=T)xGn*Q7XL^-PD&hPpu$
zYdnNEHO{>tB(ElvewIB!fqmiA%*30q-|k*Ddb9J>A?fo!_x*3Ve)aqJoj)}vsd$1=
z$?n7rERF&=(L+6#7iG+Ey3!5u*&SX_5$3tZ=y3CJ?Jt)TTW8cUzONA8w@Ute9j}H=
z7(2rSYy0$Lq6tww;nO+Vo%B}UEU<YY#L$o)Q<xQ??-S9sp106_iqeWu|ApQyKh=)^
zQj6HY6@Pr{ufI<NBrmqEe{pBoA-@xKoV7|VYngWZoWL9}-^X%b6Mww<)w>LR9ci^n
zG2!2ta_*c@IIqTZ$18P1@~O&(Nxm-x7pgwy{OVaO8}V_gS?-e=TYN8E;b8dCUb)K1
z{4ihGc0IutC%HG48=GwR{kiD!*$cZaJ+hLm+9!M|ZPCk?pzdWaR2QVTY`mGFCG+mc
z{&fvXvC3Ok$1gl-#Oiz1Yw9{dt*cTdwv#%S<z}_76SU(lc`#qOz<Aa)mxb9aXWTD_
zEdJBBER*|dufXKyW%|v(Kb)7{<9nT>FL7x`)F+c!=QK;L+%#<dyk@TDdHaP+ZTb)6
zwRXF0<^C#N(LQ}&>wx~{6~!0%+R6enJ?$1Gv*<+5Wd8B>@S-VEe_qY{{^|D%$wtO4
zm5#R?c-C$*<8D&mKt@a#_zNCy<X-;x);IMk^XL<iZ+&%t=BK6B{+W8}$GrTs&Cg2X
zelD@!xkdHinVmbH9lm_`_T{gw1xALinG>$s^1c+@J9)Xalkxf$tnO1Uoo7Cu-o8!E
z{d>P}ru@X{)go_${nzkr(&c+UN9?xzx2AOhRfqXhTN<msxa%I?x1P@?TIkpNQyJ;I
zI!{{KE{x87wQ;fI*XToUZ*H8oq^EJ?&)kF7*`crRO<;>vd=r@e)`H32uRv@@g=zcC
z=-9>mTkk~2%jW6#eO+_rz?}0-=Grb^v+cK3pNrKtl}#qyOL$*!DXMcdOqst|SpT;2
zTk&MurRReu_&?K2i->(JJ!`Q{Xs1Z}#O;Eg8I$zBxNN(nw)0Etgb92FrHscvYu<8Q
zCtAF?eA;2V+1!y+@>1?HZqhSae)a2=)jus)-Fx<0_DSdh^_K5q?EW!(r1iE2JYFEA
z^<mzjxYND$J8rm5?dDpsVE?RZ`!|?=N>^XLCuD(kOW)*I+t1dz?HB&GqPIwAZAE~d
zo6pH6ha0<_F06Pb)-wN!mE#W!pLv&Nh)c*G{H3}0bWfjvaG>qg<dPQMX;1d2#uZnk
zCQn%yik{2fg<Ol=%jTxx7aPKNM)J9l-l3-rzXFRNMmb0xbB&O*{BTY(!j_*|Sw)BC
zgG;QbK~wb+tA^%mL!GA2zTK0)xbcQq^mZTk%6sa)+476;TT&ku=}i36qfk&kPvK6$
zKH(OlrG5g}S}Ir$&QbEuJhsN%%Biw4_<(7%atZ(Z{eN9~`VK5wdh)H&`mL2%od+)y
l-kp2mUkNTPR9=?-mTzpDQ*p&~q64Vt@^tlcS?83{1OTPAGdutQ

literal 0
HcmV?d00001

diff --git a/tests/typ/math/prime.typ b/tests/typ/math/prime.typ
new file mode 100644
index 000000000..61e0c0b20
--- /dev/null
+++ b/tests/typ/math/prime.typ
@@ -0,0 +1,9 @@
+// Test prime symbols after code mode.
+#let g = $f$
+#let gg = $f$
+
+$
+  #(g)' #g' #g ' \
+  #g''''''''''''''''' \
+  gg'
+$