Skip to content
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.

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

feat(isolated-declarations): support optional class methods #4035

Merged
merged 2 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions crates/oxc_codegen/src/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2413,6 +2413,9 @@ impl<'a, const MINIFY: bool> Gen<MINIFY> for MethodDefinition<'a> {
if self.computed {
p.print(b']');
}
if self.optional {
p.print(b'?');
}
if let Some(type_parameters) = self.value.type_parameters.as_ref() {
type_parameters.gen(p, ctx);
}
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_codegen/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ fn typescript() {
);
test_ts("let foo: { <T>(t: T): void }", "let foo: {<T>(t: T): void};\n", false);
test_ts("function <const T>(){}", "function<const T>() {}\n", false);
test_ts("class A {m?(): void}", "class A {\n\tm?(): void;\n}\n", false);
}

fn test_comment_helper(source_text: &str, expected: &str) {
Expand Down
4 changes: 3 additions & 1 deletion crates/oxc_isolated_declarations/src/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,9 @@ impl<'a> IsolatedDeclarations<'a> {
match element {
ClassElement::StaticBlock(_) => {}
ClassElement::MethodDefinition(ref method) => {
if !method.r#type.is_abstract() && method.value.body.is_none() {
if !(method.r#type.is_abstract() || method.optional)
&& method.value.body.is_none()
{
is_function_overloads = true;
} else if is_function_overloads {
// Skip implementation of function overloads
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_isolated_declarations/tests/fixtures/class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class Zoo {

export abstract class Qux {
abstract foo(): void;
protected foo2?(): void;
bar(): void {}
baz(): void {}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export declare class Zoo {
}
export declare abstract class Qux {
abstract foo(): void;
protected foo2?(): void;
bar(): void;
baz(): void;
}
Expand Down
Loading