Skip to content

parser: surface variadic token in Arg AST #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Jun 14, 2026
Merged

parser: surface variadic token in Arg AST #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/squawk_fmt/src/fmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ fn build_op<'a>(op: ast::BinOp) -> Doc<'a> {
ast::BinOp::ColonEq(_) => Doc::text(":="),
ast::BinOp::CustomOp(custom_op) => Doc::text(custom_op.syntax().to_string()),
ast::BinOp::Eq(_) => Doc::text("="),
ast::BinOp::Escape(_) => Doc::text("escape"),
ast::BinOp::FatArrow(_) => Doc::text("=>"),
ast::BinOp::Gteq(_) => Doc::text(">="),
ast::BinOp::Ilike(_) => Doc::text("ilike"),
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_ide/src/column_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ fn name_from_name_ref(
SyntaxKind::FLOAT_KW => {
let precision = arg_list.and_then(|arg| {
arg.args().find_map(|arg| {
if let ast::Arg::Expr(ast::Expr::Literal(lit)) = arg {
if let Some(ast::Expr::Literal(lit)) = arg.expr() {
lit.syntax().text().to_string().parse::<u32>().ok()
} else {
None
Expand Down
4 changes: 2 additions & 2 deletions crates/squawk_ide/src/resolve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,11 +749,11 @@ fn fallback_type_alias(type_name: &Name) -> Option<Name> {

fn resolve_float_precision(name_ref: &ast::NameRef, type_name: Name) -> Name {
if type_name.0.as_str() == "float"
&& let Some(ast::Arg::Expr(ast::Expr::Literal(lit))) = name_ref
&& let Some(ast::Expr::Literal(lit)) = name_ref
.syntax()
.ancestors()
.find_map(ast::PathType::cast)
.and_then(|x| x.arg_list()?.args().next())
.and_then(|x| x.arg_list()?.args().next()?.expr())
{
let precision: u32 = lit.syntax().text().to_string().parse().unwrap_or(0);
return Name::from_string(if precision <= 24 { "float4" } else { "float8" });
Expand Down
1 change: 1 addition & 0 deletions crates/squawk_parser/src/generated/syntax_kind.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,8 +1799,8 @@ fn type_mods(
R_PAREN,
COMMA,
|| "unexpected comma".to_string(),
EXPR_FIRST,
|p| expr(p).is_some(),
EXPR_FIRST.union(TokenSet::new(&[VARIADIC_KW])),
|p| arg_expr(p).is_some(),
);
m.complete(p, ARG_LIST);
}
Expand Down Expand Up @@ -1963,13 +1963,19 @@ fn simple_type_name(p: &mut Parser<'_>) {

fn arg_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
// https://www.postgresql.org/docs/17/typeconv-func.html
let m = p.start();
p.eat(VARIADIC_KW);
let r = Restrictions {
order_by_allowed: true,
as_allowed: true,
..Restrictions::default()
};
expr_bp(p, 1, &r)
match expr_bp(p, 1, &r) {
Some(_) => Some(m.complete(p, ARG)),
None => {
m.abandon(p);
None
}
}
}

fn arg_list(p: &mut Parser<'_>) {
Expand Down Expand Up @@ -2457,7 +2463,6 @@ fn current_op(p: &Parser<'_>, r: &Restrictions) -> (u8, SyntaxKind, Associativit
PERCENT if p.next_not_joined_op(0) => (9, PERCENT, Left), // symbol
// and
AND_KW if !r.and_disabled => (2, AND_KW, Left),
AS_KW if r.as_allowed => (7, AS_KW, Left),
// /
SLASH if p.next_not_joined_op(0) => (9, SLASH, Left), // symbol
// *
Expand All @@ -2484,7 +2489,6 @@ const OVERLAPPING_TOKENS: TokenSet = TokenSet::new(&[OR_KW, AND_KW, IS_KW, COLLA
#[derive(Default)]
struct Restrictions {
order_by_allowed: bool,
as_allowed: bool,
in_disabled: bool,
is_disabled: bool,
not_disabled: bool,
Expand Down
45 changes: 27 additions & 18 deletions crates/squawk_parser/tests/snapshots/tests__alter_extension_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
WHITESPACE " "
AS_KW "as"
Expand Down Expand Up @@ -677,8 +678,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
COMMA ","
WHITESPACE " "
Expand Down Expand Up @@ -759,8 +761,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
SEMICOLON ";"
Expand Down Expand Up @@ -888,8 +891,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
SEMICOLON ";"
Expand Down Expand Up @@ -923,8 +927,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
SEMICOLON ";"
Expand Down Expand Up @@ -1148,8 +1153,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
COMMA ","
WHITESPACE " "
Expand Down Expand Up @@ -1230,8 +1236,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
SEMICOLON ";"
Expand Down Expand Up @@ -1289,8 +1296,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
COMMA ","
WHITESPACE " "
Expand Down Expand Up @@ -1371,8 +1379,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
SEMICOLON ";"
Expand Down
5 changes: 3 additions & 2 deletions crates/squawk_parser/tests/snapshots/tests__alter_operator_family_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
R_PAREN ")"
WHITESPACE " "
Expand Down
5 changes: 3 additions & 2 deletions crates/squawk_parser/tests/snapshots/tests__alter_sequence_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
WHITESPACE "\n "
SEQUENCE_OPTION
Expand Down
35 changes: 21 additions & 14 deletions crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ SOURCE_FILE
NUMERIC_KW "numeric"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "10"
ARG
LITERAL
INT_NUMBER "10"
COMMA ","
WHITESPACE " "
LITERAL
INT_NUMBER "2"
ARG
LITERAL
INT_NUMBER "2"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n\n"
Expand Down Expand Up @@ -2548,12 +2550,14 @@ SOURCE_FILE
IDENT "tsrange"
ARG_LIST
L_PAREN "("
NAME_REF
IDENT "b"
ARG
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
NAME_REF
IDENT "c"
ARG
NAME_REF
IDENT "c"
R_PAREN ")"
WHITESPACE " "
WITH_KW "with"
Expand Down Expand Up @@ -2608,12 +2612,14 @@ SOURCE_FILE
IDENT "tsrange"
ARG_LIST
L_PAREN "("
NAME_REF
IDENT "b"
ARG
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
NAME_REF
IDENT "c"
ARG
NAME_REF
IDENT "c"
R_PAREN ")"
WHITESPACE " "
WITH_KW "with"
Expand Down Expand Up @@ -3838,8 +3844,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "30"
ARG
LITERAL
INT_NUMBER "30"
R_PAREN ")"
WHITESPACE " "
DEFAULT_CONSTRAINT
Expand Down
10 changes: 6 additions & 4 deletions crates/squawk_parser/tests/snapshots/tests__alter_type_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
WHITESPACE " "
RESTRICT_KW "restrict"
Expand Down Expand Up @@ -623,8 +624,9 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
WHITESPACE " "
COLLATE
Expand Down
44 changes: 24 additions & 20 deletions crates/squawk_parser/tests/snapshots/tests__call_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ SOURCE_FILE
IDENT "partition_data_proc"
ARG_LIST
L_PAREN "("
LITERAL
STRING "'partman_test.time_taptest_table'"
ARG
LITERAL
STRING "'partman_test.time_taptest_table'"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
Expand All @@ -49,28 +50,31 @@ SOURCE_FILE
IDENT "do_db_maintenance"
ARG_LIST
L_PAREN "("
NAMED_ARG
NAME_REF
IDENT "x"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
LITERAL
STRING "'1'"
ARG
NAMED_ARG
NAME_REF
IDENT "x"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
LITERAL
STRING "'1'"
COMMA ","
WHITESPACE " "
LITERAL
NULL_KW "null"
ARG
LITERAL
NULL_KW "null"
COMMA ","
WHITESPACE " "
NAMED_ARG
NAME_REF
IDENT "b"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
LITERAL
STRING "'d'"
ARG
NAMED_ARG
NAME_REF
IDENT "b"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
LITERAL
STRING "'d'"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
10 changes: 6 additions & 4 deletions crates/squawk_parser/tests/snapshots/tests__comment_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,17 +637,19 @@ SOURCE_FILE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "100"
ARG
LITERAL
INT_NUMBER "100"
R_PAREN ")"
COMMA ","
WHITESPACE " "
CHAR_TYPE
VARCHAR_KW "varchar"
ARG_LIST
L_PAREN "("
LITERAL
INT_NUMBER "200"
ARG
LITERAL
INT_NUMBER "200"
R_PAREN ")"
R_PAREN ")"
WHITESPACE " "
Expand Down
Loading
Loading