Skip to content

fix: Allow union types in function returns #444

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

Open
Ahajha wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Allow union types in function returns #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb1c49
fix: Allow union types in function returns
Ahajha Oct 4, 2026
67e4a57
test
Ahajha Oct 4, 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
55 changes: 32 additions & 23 deletions crates/starpls_hir/src/typeck/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,10 @@ def bar(x):
# type: (int | string | None) -> None
pass

def baz():
# type: () -> string | int | None
pass

x = 1 # type: int | None
foo(x)
bar(x)
Expand All @@ -399,31 +403,36 @@ bar(y)

y = "goodbye" # type: int | string | float | None
bar(y)

z = baz()
"#,
expect![[r#"
113..114 "x": int | None
117..118 "1": Literal[1]
138..141 "foo": def foo(x: int) -> None
142..143 "x": int | None
138..144 "foo(x)": None
145..148 "bar": def bar(x: int | string | None) -> None
149..150 "x": int | None
145..151 "bar(x)": None
152..155 "bar": def bar(x: int | string | None) -> None
156..157 "2": Literal[2]
152..158 "bar(2)": None
160..161 "y": int | string
164..171 "\"hello\"": Literal["hello"]
193..196 "bar": def bar(x: int | string | None) -> None
197..198 "y": int | string
193..199 "bar(y)": None
201..202 "y": int | string | float | None
205..214 "\"goodbye\"": Literal["goodbye"]
251..254 "bar": def bar(x: int | string | None) -> None
255..256 "y": int | string | float | None
251..257 "bar(y)": None

255..256 Argument of type "int | string | float | None" cannot be assigned to parameter of type "int | string | None"
172..173 "x": int | None
176..177 "1": Literal[1]
197..200 "foo": def foo(x: int) -> None
201..202 "x": int | None
197..203 "foo(x)": None
204..207 "bar": def bar(x: int | string | None) -> None
208..209 "x": int | None
204..210 "bar(x)": None
211..214 "bar": def bar(x: int | string | None) -> None
215..216 "2": Literal[2]
211..217 "bar(2)": None
219..220 "y": int | string
223..230 "\"hello\"": Literal["hello"]
252..255 "bar": def bar(x: int | string | None) -> None
256..257 "y": int | string
252..258 "bar(y)": None
260..261 "y": int | string | float | None
264..273 "\"goodbye\"": Literal["goodbye"]
310..313 "bar": def bar(x: int | string | None) -> None
314..315 "y": int | string | float | None
310..316 "bar(y)": None
318..319 "z": string | int | None
322..325 "baz": def baz() -> string | int | None
322..327 "baz()": string | int | None

314..315 Argument of type "int | string | float | None" cannot be assigned to parameter of type "int | string | None"
"#]],
)
}
Expand Down
2 changes: 1 addition & 1 deletion crates/starpls_parser/src/grammar/type_comments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub(crate) fn function_type(p: &mut Parser) -> CompletedMarker {
p.error_recover_until("Expected \"->\"", EMPTY);
return m.complete(p, FUNCTION_TYPE);
}
type_(p);
union_type(p);
m.complete(p, FUNCTION_TYPE)
}

Expand Down