Merge 53d13bae369ec3a186e2a7e3a340cb0032c48e1a into af2253ba16dfdc731e787e3a43a6f6a63ea65e0a

crates/typst-eval/src/math.rs

@@ -1,5 +1,5 @@
 use ecow::eco_format;
-use typst_library::diag::{At, SourceResult};
+use typst_library::diag::{warning, At, SourceResult};
 use typst_library::foundations::{Content, NativeElement, Symbol, SymbolElem, Value};
 use typst_library::math::{
     AlignPointElem, AttachElem, FracElem, LrElem, PrimesElem, RootElem,
@@ -80,7 +80,14 @@ impl Eval for ast::MathAttach<'_> {
         let mut elem = AttachElem::new(base);
 
         if let Some(expr) = self.top() {
-            elem.t.set(Some(expr.eval_display(vm)?));
+            let top = expr.eval(vm)?;
+            if let Value::Func(_) = top {
+                vm.engine.sink.warn(warning!(
+                    expr.span(), "function literal used as superscript";
+                    hint: "wrap the entire function call in parentheses",
+                ));
+            }
+            elem.t.set(Some(top.display().spanned(self.span())));
         }
 
         // Always attach primes in scripts style (not limits style),
@@ -90,7 +97,14 @@ impl Eval for ast::MathAttach<'_> {
         }
 
         if let Some(expr) = self.bottom() {
-            elem.b.set(Some(expr.eval_display(vm)?));
+            let bottom = expr.eval(vm)?;
+            if let Value::Func(_) = bottom {
+                vm.engine.sink.warn(warning!(
+                    expr.span(), "function literal used as subscript";
+                    hint: "wrap the entire function call in parentheses",
+                ));
+            }
+            elem.b.set(Some(bottom.display().spanned(self.span())));
         }
 
         Ok(elem.pack())

crates/typst-syntax/src/parser.rs

@@ -384,10 +384,10 @@ fn math_expr_prec(p: &mut Parser, min_prec: usize, stop: SyntaxKind) {
 fn math_op(kind: SyntaxKind) -> Option<(SyntaxKind, SyntaxKind, ast::Assoc, usize)> {
     match kind {
         SyntaxKind::Underscore => {
-            Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 2))
+            Some((SyntaxKind::MathAttach, SyntaxKind::Hat, ast::Assoc::Right, 3))
         }
         SyntaxKind::Hat => {
-            Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 2))
+            Some((SyntaxKind::MathAttach, SyntaxKind::Underscore, ast::Assoc::Right, 3))
         }
         SyntaxKind::Slash => {
             Some((SyntaxKind::MathFrac, SyntaxKind::End, ast::Assoc::Left, 1))

tests/suite/math/accent.typ

@@ -34,7 +34,7 @@ $tilde(sum), tilde(sum, size: #50%), accent(H, hat, size: #200%)$
 
 --- math-accent-sized-script ---
 // Test accent size in script size.
-$tilde(U, size: #1.1em), x^tilde(U, size: #1.1em), sscript(tilde(U, size: #1.1em))$
+$tilde(U, size: #1.1em), x^(tilde(U, size: #1.1em)), sscript(tilde(U, size: #1.1em))$
 
 --- math-accent-dotless ---
 // Test dotless glyph variants.

tests/suite/math/attach.typ

@@ -42,9 +42,41 @@ attach(a, tl: u, t: t, tr: v, bl: x, b: b, br: y)
 $
 
 --- math-attach-followed-by-func-call ---
-// Test function call after subscript.
-$pi_1(Y), a_f(x), a^zeta (x), a^abs(b)_sqrt(c) \
- a^subset.eq (x), a_(zeta(x)), pi_(1(Y)), a^(abs(b))_(sqrt(c))$
+// Test function call after subscripts and superscripts.
+#set page(width: auto)
+$a_1(x), a^10(x), a_f(x), a^zeta(x), a_"text"(x),
+// Warning: 22-25 function literal used as subscript
+// Hint: 22-25 wrap the entire function call in parentheses
+// Warning: 32-36 function literal used as superscript
+// Hint: 32-36 wrap the entire function call in parentheses
+ a_∂(x), a^cos(x), a_abs(x), a^root(2, x), a_subset.eq(x) \
+ a_(1(x)), a^(10(x)), a_(f(x)), a^(zeta(x)), a_("text"(x)),
+ a_(∂(x)), a^(cos(x)), a_(abs(x)), a^(root(2, x)), a_(subset.eq(x))$
+
+--- math-attach-followed-by-func-call-complex ---
+// Test function call with named arguments after scripts.
+#let cross = $c$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_cancel(x, cross: #true)$
+
+--- math-attach-followed-by-func-call-error ---
+// Error: 14-19 unknown variable: cross
+// Hint: 14-19 if you meant to display multiple letters as is, try adding spaces between each letter: `c r o s s`
+// Hint: 14-19 or if you meant to display this as text, try placing it in quotes: `"cross"`
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_cancel(x, cross: #true)$
+
+--- math-attach-followed-by-func-call-warning ---
+// Test warning for function literal as subscripts and superscripts.
+#let myfunc(arg) = $arg$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_myfunc(x) a_(myfunc(x))$
+// Warning: 4-10 function literal used as subscript
+// Hint: 4-10 wrap the entire function call in parentheses
+$a_myfunc a_(myfunc)$
 
 --- math-attach-nested ---
 // Test associativity and scaling.

tests/suite/text/raw.typ

@@ -215,7 +215,7 @@ box[]
 hello.world
 hello.world()
 hello.my.world()
-f_zeta(x), f_zeta(x)/1
+f_(zeta(x)), f_(zeta(x))/1
 emph(hello.my.world())
 emph(hello.my().world)
 emph(hello.my().world())