Skip to content

parser: fix various ast gaps #1190

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 3 commits into from
Jun 6, 2026
Merged

parser: fix various ast gaps #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2201b43
parser: fix various ast gaps
sbdchd Jun 6, 2026
c384d8d
fix-snaps
sbdchd Jun 6, 2026
ec63145
fix tests
sbdchd Jun 6, 2026
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
3 changes: 2 additions & 1 deletion crates/squawk_ide/src/expand_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const DELIMITED_LIST_KINDS: &[SyntaxKind] = &[
SyntaxKind::PARAM_LIST,
SyntaxKind::PARTITION_ITEM_LIST,
SyntaxKind::PARTITION_LIST,
SyntaxKind::PATH_LIST,
SyntaxKind::RETURNING_OPTION_LIST,
SyntaxKind::REVOKE_COMMAND_LIST,
SyntaxKind::ROLE_REF_LIST,
Expand Down Expand Up @@ -552,7 +553,7 @@ $0
#[test]
fn list_variants() {
let delimited_ws_list_kinds = &[
SyntaxKind::CREATE_DATABASE_OPTION_LIST,
SyntaxKind::DATABASE_OPTION_LIST,
SyntaxKind::FUNC_OPTION_LIST,
SyntaxKind::ROLE_OPTION_LIST,
SyntaxKind::SEQUENCE_OPTION_LIST,
Expand Down
3 changes: 2 additions & 1 deletion crates/squawk_ide/src/folding_ranges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
| SyntaxKind::CONFLICT_INDEX_ITEM_LIST
| SyntaxKind::CONSTRAINT_EXCLUSION_LIST
| SyntaxKind::COPY_OPTION_LIST
| SyntaxKind::CREATE_DATABASE_OPTION_LIST
| SyntaxKind::DATABASE_OPTION_LIST
| SyntaxKind::DROP_OP_CLASS_OPTION_LIST
| SyntaxKind::FDW_OPTION_LIST
| SyntaxKind::FUNCTION_SIG_LIST
Expand All @@ -139,6 +139,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
| SyntaxKind::OP_SIG_LIST
| SyntaxKind::PARTITION_ITEM_LIST
| SyntaxKind::PARTITION_LIST
| SyntaxKind::PATH_LIST
| SyntaxKind::RETURNING_OPTION_LIST
| SyntaxKind::REVOKE_COMMAND_LIST
| SyntaxKind::ROLE_OPTION_LIST
Expand Down
4 changes: 3 additions & 1 deletion crates/squawk_linter/src/rules/require_table_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ pub(crate) fn require_table_schema(ctx: &mut Linter, parse: &Parse<SourceFile>)
check_path(ctx, alter_table.relation_name().and_then(|r| r.path()));
}
ast::Stmt::DropTable(drop_table) => {
check_path(ctx, drop_table.path());
for path in drop_table.paths() {
check_path(ctx, Some(path));
}
}
_ => (),
}
Expand Down
7 changes: 5 additions & 2 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.

53 changes: 36 additions & 17 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7570,7 +7570,7 @@ fn alter_database(p: &mut Parser<'_>) -> CompletedMarker {
m.complete(p, REFRESH_COLLATION_VERSION);
}
_ => {
opt_create_database_option_list(p);
opt_database_option_list(p);
}
}
p.eat(SEMICOLON);
Expand All @@ -7586,15 +7586,15 @@ fn set_tablespace(p: &mut Parser<'_>) {
m.complete(p, SET_TABLESPACE);
}

fn opt_create_database_option_list(p: &mut Parser<'_>) {
fn opt_database_option_list(p: &mut Parser<'_>) {
let m = p.start();
p.eat(WITH_KW);
while !p.at(EOF) {
if !opt_create_database_option(p) {
if !opt_database_option(p) {
break;
}
}
m.complete(p, CREATE_DATABASE_OPTION_LIST);
m.complete(p, DATABASE_OPTION_LIST);
}

// ALTER CONVERSION name RENAME TO new_name
Expand Down Expand Up @@ -8008,6 +8008,14 @@ fn path_name_ref_list(p: &mut Parser<'_>) {
}
}

fn path_list(p: &mut Parser<'_>) {
let m = p.start();
p.expect(L_PAREN);
path_name_ref_list(p);
p.expect(R_PAREN);
m.complete(p, PATH_LIST);
}

// ALTER TEXT SEARCH TEMPLATE name RENAME TO new_name
// ALTER TEXT SEARCH TEMPLATE name SET SCHEMA new_schema
fn alter_text_search_template(p: &mut Parser<'_>) -> CompletedMarker {
Expand Down Expand Up @@ -9276,8 +9284,11 @@ fn create_collation(p: &mut Parser<'_>) -> CompletedMarker {
p.bump(COLLATION_KW);
opt_if_not_exists(p);
path_name(p);
if p.eat(FROM_KW) {
if p.at(FROM_KW) {
let from = p.start();
p.bump(FROM_KW);
path_name_ref(p);
from.complete(p, COLLATION_FROM);
} else {
attribute_list(p);
}
Expand Down Expand Up @@ -9320,7 +9331,7 @@ fn opt_option_value(p: &mut Parser<'_>) -> bool {
true
}

fn opt_create_database_option(p: &mut Parser<'_>) -> bool {
fn opt_database_option(p: &mut Parser<'_>) -> bool {
let m = p.start();
// option name
match p.current() {
Expand All @@ -9339,10 +9350,10 @@ fn opt_create_database_option(p: &mut Parser<'_>) -> bool {
p.eat(EQ);
if !opt_option_value(p) {
p.error("expected create database option value");
m.complete(p, CREATE_DATABASE_OPTION);
m.complete(p, DATABASE_OPTION);
return false;
}
m.complete(p, CREATE_DATABASE_OPTION);
m.complete(p, DATABASE_OPTION);
true
}

Expand Down Expand Up @@ -9370,7 +9381,7 @@ fn create_database(p: &mut Parser<'_>) -> CompletedMarker {
p.bump(CREATE_KW);
p.bump(DATABASE_KW);
name(p);
opt_create_database_option_list(p);
opt_database_option_list(p);
p.eat(SEMICOLON);
m.complete(p, CREATE_DATABASE)
}
Expand Down Expand Up @@ -12763,18 +12774,22 @@ fn copy_option_list(p: &mut Parser<'_>) {
}

fn opt_copy_option_item(p: &mut Parser<'_>) -> bool {
match p.current() {
let m = p.start();
let parsed = match p.current() {
BINARY_KW | FREEZE_KW | CSV_KW | HEADER_KW | JSON_KW => {
p.bump_any();
true
}
DELIMITER_KW | NULL_KW | QUOTE_KW | ESCAPE_KW => {
p.bump_any();
p.eat(AS_KW);
string_literal(p);
true
}
ENCODING_KW => {
p.bump_any();
string_literal(p);
true
}
FORCE_KW => {
p.bump_any();
Expand All @@ -12785,20 +12800,26 @@ fn opt_copy_option_item(p: &mut Parser<'_>) -> bool {
if !p.eat(STAR) {
name_ref_list(p);
}
true
}
QUOTE_KW | NULL_KW => {
p.bump_any();
if !p.eat(STAR) {
name_ref_list(p);
}
true
}
_ => return false,
_ => false,
}
}

_ => return false,
_ => false,
};
if parsed {
m.complete(p, COPY_LEGACY_OPTION);
} else {
m.abandon(p);
}
true
parsed
}

// COPY table_name [ ( column_name [, ...] ) ]
Expand Down Expand Up @@ -14999,9 +15020,7 @@ fn opt_alter_table_action(p: &mut Parser<'_>) -> Option<CompletedMarker> {
let m = p.start();
p.bump(MERGE_KW);
p.expect(PARTITIONS_KW);
p.expect(L_PAREN);
path_name_ref_list(p);
p.expect(R_PAREN);
path_list(p);
p.eat(INTO_KW);
path_name(p);
m.complete(p, MERGE_PARTITIONS)
Expand Down
20 changes: 10 additions & 10 deletions crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ SOURCE_FILE
NAME_REF
IDENT "d"
WHITESPACE " "
CREATE_DATABASE_OPTION_LIST
DATABASE_OPTION_LIST
WITH_KW "with"
WHITESPACE " "
CREATE_DATABASE_OPTION
DATABASE_OPTION
IDENT "allow_connections"
WHITESPACE " "
LITERAL
Expand All @@ -247,8 +247,8 @@ SOURCE_FILE
NAME_REF
IDENT "d"
WHITESPACE " "
CREATE_DATABASE_OPTION_LIST
CREATE_DATABASE_OPTION
DATABASE_OPTION_LIST
DATABASE_OPTION
CONNECTION_KW "connection"
WHITESPACE " "
LIMIT_KW "limit"
Expand All @@ -267,8 +267,8 @@ SOURCE_FILE
NAME_REF
IDENT "d"
WHITESPACE " "
CREATE_DATABASE_OPTION_LIST
CREATE_DATABASE_OPTION
DATABASE_OPTION_LIST
DATABASE_OPTION
IDENT "is_template"
WHITESPACE " "
LITERAL
Expand All @@ -285,24 +285,24 @@ SOURCE_FILE
NAME_REF
IDENT "d"
WHITESPACE " "
CREATE_DATABASE_OPTION_LIST
DATABASE_OPTION_LIST
WITH_KW "with"
WHITESPACE " "
CREATE_DATABASE_OPTION
DATABASE_OPTION
IDENT "allow_connections"
WHITESPACE " "
LITERAL
TRUE_KW "true"
WHITESPACE " "
CREATE_DATABASE_OPTION
DATABASE_OPTION
CONNECTION_KW "connection"
WHITESPACE " "
LIMIT_KW "limit"
WHITESPACE " "
LITERAL
INT_NUMBER "10"
WHITESPACE " "
CREATE_DATABASE_OPTION
DATABASE_OPTION
IDENT "is_template"
WHITESPACE " "
LITERAL
Expand Down
30 changes: 16 additions & 14 deletions crates/squawk_parser/tests/snapshots/tests__create_collation_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ SOURCE_FILE
NAME
IDENT "c"
WHITESPACE " "
FROM_KW "from"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "d"
COLLATION_FROM
FROM_KW "from"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "d"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- from_full"
Expand All @@ -47,17 +48,18 @@ SOURCE_FILE
NAME
IDENT "c"
WHITESPACE " "
FROM_KW "from"
WHITESPACE " "
PATH
COLLATION_FROM
FROM_KW "from"
WHITESPACE " "
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "bar"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "bar"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "d"
IDENT "d"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- with_options"
Expand Down
Loading
Loading