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

Disallow space between ident and paren in set rule (#5269)

Browse Source
This commit is contained in:
Ian Wrzesinski 2024-11-01 05:45:08 -04:00 committed by GitHub
parent 23313b0af0
commit a70b8a56ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/typst-syntax/src/parser.rs
View File

@ -1224,8 +1224,11 @@ fn array_or_dict_item(p: &mut Parser, state: &mut GroupState) {
/// Parses a function call's argument list: `(12pt, y)`. /// Parses a function call's argument list: `(12pt, y)`.
fn args(p: &mut Parser) { fn args(p: &mut Parser) {
if !p.at(SyntaxKind::LeftParen) && !p.at(SyntaxKind::LeftBracket) { if !p.directly_at(SyntaxKind::LeftParen) && !p.directly_at(SyntaxKind::LeftBracket) {
p.expected("argument list"); p.expected("argument list");
if p.at(SyntaxKind::LeftParen) || p.at(SyntaxKind::LeftBracket) {
p.hint("there may not be any spaces before the argument list");
}
} }
let m = p.marker(); let m = p.marker();

15
tests/suite/styling/set.typ
View File

@ -65,6 +65,21 @@ Hello *#x*
// Error: 12-26 set is only allowed directly in code and content blocks // Error: 12-26 set is only allowed directly in code and content blocks
#{ let x = set text(blue) } #{ let x = set text(blue) }
--- set-bad-trivia ---
// Error cases parsing set rules with trivia between the function and args.
// Error: 10 expected argument list
#set page
(numbering: "1")
// Error: 10 expected argument list
// Hint: 10 there may not be any spaces before the argument list
#set page (numbering: "2")
// Error: 10 expected argument list
// Hint: 10 there may not be any spaces before the argument list
#set page/**/(numbering: "3")
// This is fine though
#set/**/page(numbering: "4")
--- set-vs-construct-1 --- --- set-vs-construct-1 ---
// Ensure that constructor styles aren't passed down the tree. // Ensure that constructor styles aren't passed down the tree.
// The inner list should have no extra indent. // The inner list should have no extra indent.