Skip to content

parser/ide: semantic highlighting more types + better param parsing #1068

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
Apr 16, 2026
Merged

parser/ide: semantic highlighting more types + better param parsing #1068

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
114 changes: 112 additions & 2 deletions crates/squawk_ide/src/semantic_tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,40 @@ fn highlight_type(out: &mut SemanticTokenBuilder, ty: ast::Type) {
match ty {
ast::Type::ArrayType(_) => (),
ast::Type::BitType(bit_type) => {
if let Some(token) = bit_type.setof_token() {
out.push_type(token.into());
}
if let Some(token) = bit_type.bit_token() {
out.push_type(token.into());
}
if let Some(token) = bit_type.varying_token() {
out.push_type(token.into());
}
}
ast::Type::CharType(char_type) => {
if let Some(token) = char_type.setof_token() {
out.push_type(token.into());
}
if let Some(token) = char_type.national_token() {
out.push_type(token.into());
}

if let Some(token) = char_type
.varchar_token()
.or_else(|| char_type.nchar_token())
.or_else(|| char_type.character_token())
.or_else(|| char_type.char_token())
{
out.push_type(token.into());
};
}
if let Some(token) = char_type.varying_token() {
out.push_type(token.into());
}
}
ast::Type::DoubleType(double_type) => {
if let Some(token) = double_type.setof_token() {
out.push_type(token.into());
}
if let Some(token) = double_type.double_token() {
out.push_type(token.into());
}
Expand All @@ -67,19 +86,56 @@ fn highlight_type(out: &mut SemanticTokenBuilder, ty: ast::Type) {
}
ast::Type::ExprType(_) => (),
ast::Type::IntervalType(interval_type) => {
if let Some(token) = interval_type.setof_token() {
out.push_type(token.into());
}
if let Some(token) = interval_type.interval_token() {
out.push_type(token.into());
}
}
ast::Type::PathType(_) => (),
ast::Type::PathType(path_type) => {
if let Some(token) = path_type.setof_token() {
out.push_type(token.into());
}
}
ast::Type::PercentType(_) => (),
ast::Type::TimeType(time_type) => {
if let Some(token) = time_type.setof_token() {
out.push_type(token.into());
}
if let Some(token) = time_type
.timestamp_token()
.or_else(|| time_type.time_token())
{
out.push_type(token.into());
}

if let Some(timezone) = time_type.timezone() {
match timezone {
ast::Timezone::WithTimezone(with_timezone) => {
if let Some(token) = with_timezone.with_token() {
out.push_type(token.into());
}
if let Some(token) = with_timezone.time_token() {
out.push_type(token.into());
}
if let Some(token) = with_timezone.zone_token() {
out.push_type(token.into());
}
}
ast::Timezone::WithoutTimezone(without_timezone) => {
if let Some(token) = without_timezone.without_token() {
out.push_type(token.into());
}
if let Some(token) = without_timezone.time_token() {
out.push_type(token.into());
}
if let Some(token) = without_timezone.zone_token() {
out.push_type(token.into());
}
}
}
}
}
}
}
Expand Down Expand Up @@ -520,6 +576,60 @@ select '1'::double precision;
"#);
}

#[test]
fn cast_time_and_timestamp_time_zone() {
assert_snapshot!(semantic_tokens(
"
select cast(1 as timestamp with time zone), cast(1 as timestamp without time zone), cast(1 as time with time zone), cast(1 as time without time zone);
",
), @r#"
"timestamp" @ 18..27: Type
"with" @ 28..32: Type
"time" @ 33..37: Type
"zone" @ 38..42: Type
"timestamp" @ 55..64: Type
"without" @ 65..72: Type
"time" @ 73..77: Type
"zone" @ 78..82: Type
"time" @ 95..99: Type
"with" @ 100..104: Type
"time" @ 105..109: Type
"zone" @ 110..114: Type
"time" @ 127..131: Type
"without" @ 132..139: Type
"time" @ 140..144: Type
"zone" @ 145..149: Type
"#);
}

#[test]
fn cast_national_character_varying_type() {
assert_snapshot!(semantic_tokens(
"
select 'foo'::national character varying;
",
), @r#"
"national" @ 15..23: Type
"character" @ 24..33: Type
"varying" @ 34..41: Type
"#);
}

#[test]
fn create_function_returns_setof_type() {
assert_snapshot!(semantic_tokens(
"
create function f() returns setof int
as 'select 1'
language sql;
",
), @r#"
"f" @ 17..18: Function
"setof" @ 29..34: Type
"int" @ 35..38: Type
"#);
}

#[test]
fn create_table_temporal_primary_key_column_types() {
assert_snapshot!(semantic_tokens(
Expand Down
4 changes: 3 additions & 1 deletion crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13749,6 +13749,9 @@ fn param(p: &mut Parser<'_>, kind: ParamKind) {
// float8 order by
// ^
ORDER_KW => true,
// double precision
// ^
PRECISION_KW if p.at(DOUBLE_KW) => true,
// we're at the end of the param, must be a type
R_PAREN | EQ | DEFAULT_KW | COMMA => true,
_ => false,
Expand Down Expand Up @@ -14005,7 +14008,6 @@ fn opt_ret_type(p: &mut Parser<'_>) {
p.error("expected table arg list");
}
} else {
p.eat(SETOF_KW);
type_name(p);
}
m.complete(p, RET_TYPE);
Expand Down
5 changes: 5 additions & 0 deletions crates/squawk_parser/tests/data/ok/create_function.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ returns null on null input
as ''
language sql;

-- regression
create function identity(double precision) returns double precision
as 'select $1'
language sql;

create function f()
returns void
strict
Expand Down
45 changes: 43 additions & 2 deletions crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ SOURCE_FILE
RET_TYPE
RETURNS_KW "returns"
WHITESPACE " "
SETOF_KW "setof"
WHITESPACE " "
PATH_TYPE
SETOF_KW "setof"
WHITESPACE " "
PATH
PATH
PATH_SEGMENT
Expand Down Expand Up @@ -976,6 +976,47 @@ SOURCE_FILE
SQL_KW "sql"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- regression"
WHITESPACE "\n"
CREATE_FUNCTION
CREATE_KW "create"
WHITESPACE " "
FUNCTION_KW "function"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME
IDENTITY_KW "identity"
PARAM_LIST
L_PAREN "("
PARAM
DOUBLE_TYPE
DOUBLE_KW "double"
WHITESPACE " "
PRECISION_KW "precision"
R_PAREN ")"
WHITESPACE " "
RET_TYPE
RETURNS_KW "returns"
WHITESPACE " "
DOUBLE_TYPE
DOUBLE_KW "double"
WHITESPACE " "
PRECISION_KW "precision"
WHITESPACE "\n"
FUNC_OPTION_LIST
AS_FUNC_OPTION
AS_KW "as"
WHITESPACE " "
LITERAL
STRING "'select $1'"
WHITESPACE "\n"
LANGUAGE_FUNC_OPTION
LANGUAGE_KW "language"
WHITESPACE " "
SQL_KW "sql"
SEMICOLON ";"
WHITESPACE "\n\n"
CREATE_FUNCTION
CREATE_KW "create"
WHITESPACE " "
Expand Down
4 changes: 4 additions & 0 deletions crates/squawk_syntax/src/ast/generated/nodes.rs
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion crates/squawk_syntax/src/postgresql.ungram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ PathType =

CharType =
'setof'?
('varchar' | ( 'character' | 'char' | 'nchar' ) 'varying'? )
('varchar' | 'national'? ( 'character' | 'char' | 'nchar' ) 'varying'? )
ArgList?

BitType =
Expand Down
Loading