Skip to content
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
2 changes: 2 additions & 0 deletions crates/oxc_formatter/src/utils/assignment_like.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ impl<'a> AssignmentLike<'a, '_> {
}
}
AssignmentLike::PropertyDefinition(property) => {
write!(f, [property.decorators()])?;

if property.declare {
write!(f, ["declare", space()])?;
}
Expand Down
19 changes: 5 additions & 14 deletions crates/oxc_formatter/src/write/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,14 @@ impl<'a> Format<'a> for AstNode<'a, Vec<'a, ClassElement<'a>>> {

impl<'a> Format<'a> for (&AstNode<'a, ClassElement<'a>>, Option<&AstNode<'a, ClassElement<'a>>>) {
fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
let decorators = match self.0.as_ast_nodes() {
AstNodes::MethodDefinition(method) => {
write!(f, [method.decorators(), method])
}
AstNodes::PropertyDefinition(property) => {
write!(f, [property.decorators(), property])
}
AstNodes::AccessorProperty(accessor) => {
write!(f, [accessor.decorators(), accessor])
}
_ => write!(f, self.0),
};

write!(f, [ClassPropertySemicolon::new(self.0, self.1)])
write!(f, [self.0, ClassPropertySemicolon::new(self.0, self.1)])
}
}

impl<'a> FormatWrite<'a> for AstNode<'a, MethodDefinition<'a>> {
fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
write!(f, [self.decorators()])?;

if let Some(accessibility) = &self.accessibility {
write!(f, [accessibility.as_str(), space()])?;
}
Expand Down Expand Up @@ -160,6 +149,8 @@ impl<'a> FormatWrite<'a> for AstNode<'a, StaticBlock<'a>> {

impl<'a> FormatWrite<'a> for AstNode<'a, AccessorProperty<'a>> {
fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
write!(f, [self.decorators()])?;

if let Some(accessibility) = self.accessibility() {
write!(f, [accessibility.as_str(), space()])?;
}
Expand Down
1 change: 0 additions & 1 deletion crates/oxc_formatter/src/write/decorators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ fn is_identifier_or_static_member_only(callee: &Expression) -> bool {

impl<'a> FormatWrite<'a> for AstNode<'a, Decorator<'a>> {
fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
self.format_leading_comments(f)?;
write!(f, ["@"]);

// Determine if parentheses are required around decorator expressions
Expand Down
4 changes: 4 additions & 0 deletions crates/oxc_formatter/tests/fixtures/ts/class/decorators.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class A {
// comment shouldn't break the decorators grouping
@memoize onContextMenu() { }
}
16 changes: 16 additions & 0 deletions crates/oxc_formatter/tests/fixtures/ts/class/decorators.ts.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
source: crates/oxc_formatter/tests/fixtures/mod.rs
---
==================== Input ====================
class A {
// comment shouldn't break the decorators grouping
@memoize onContextMenu() { }
}

==================== Output ====================
class A {
// comment shouldn't break the decorators grouping
@memoize onContextMenu() {}
}

===================== End =====================
Loading