This repository has been archived by the owner on Aug 31, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 659
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(rome_js_formatter): chain tail arrow function
- Loading branch information
Showing
11 changed files
with
242 additions
and
68 deletions.
There are no files selected for viewing
16 changes: 2 additions & 14 deletions
16
crates/rome_js_formatter/src/js/assignments/object_assignment_pattern.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| use crate::prelude::*; | ||
| use crate::utils::JsObjectPatternLike; | ||
| use crate::FormatNodeFields; | ||
| use rome_formatter::write; | ||
| use rome_js_syntax::JsObjectAssignmentPattern; | ||
| use rome_js_syntax::JsObjectAssignmentPatternFields; | ||
|
|
||
| impl FormatNodeFields<JsObjectAssignmentPattern> for FormatNodeRule<JsObjectAssignmentPattern> { | ||
| fn fmt_fields(node: &JsObjectAssignmentPattern, f: &mut JsFormatter) -> FormatResult<()> { | ||
| let JsObjectAssignmentPatternFields { | ||
| l_curly_token, | ||
| properties, | ||
| r_curly_token, | ||
| } = node.as_fields(); | ||
|
|
||
| write!( | ||
| f, | ||
| [ | ||
| format_delimited(&l_curly_token?, &properties.format(), &r_curly_token?,) | ||
| .soft_block_spaces() | ||
| ] | ||
| ) | ||
| write!(f, [JsObjectPatternLike::from(node.clone())]) | ||
| } | ||
| } |
16 changes: 2 additions & 14 deletions
16
crates/rome_js_formatter/src/js/bindings/object_binding_pattern.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| use crate::prelude::*; | ||
| use crate::utils::JsObjectPatternLike; | ||
| use crate::FormatNodeFields; | ||
| use rome_formatter::write; | ||
| use rome_js_syntax::JsObjectBindingPattern; | ||
| use rome_js_syntax::JsObjectBindingPatternFields; | ||
|
|
||
| impl FormatNodeFields<JsObjectBindingPattern> for FormatNodeRule<JsObjectBindingPattern> { | ||
| fn fmt_fields(node: &JsObjectBindingPattern, f: &mut JsFormatter) -> FormatResult<()> { | ||
| let JsObjectBindingPatternFields { | ||
| l_curly_token, | ||
| properties, | ||
| r_curly_token, | ||
| } = node.as_fields(); | ||
|
|
||
| write!( | ||
| f, | ||
| [ | ||
| format_delimited(&l_curly_token?, &properties.format(), &r_curly_token?,) | ||
| .soft_block_spaces() | ||
| ] | ||
| ) | ||
| write!(f, [JsObjectPatternLike::from(node.clone())]) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
crates/rome_js_formatter/src/utils/object_pattern_like.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| use crate::prelude::*; | ||
| use crate::JsFormatContext; | ||
| use rome_formatter::formatter::Formatter; | ||
| use rome_formatter::write; | ||
| use rome_formatter::{Format, FormatResult}; | ||
| use rome_js_syntax::{ | ||
| JsAnyAssignmentPattern, JsAnyBindingPattern, JsAnyObjectAssignmentPatternMember, | ||
| JsAnyObjectBindingPatternMember, JsObjectAssignmentPattern, JsObjectBindingPattern, | ||
| JsSyntaxKind, JsSyntaxToken, | ||
| }; | ||
| use rome_rowan::{declare_node_union, AstNode, SyntaxResult}; | ||
|
|
||
| declare_node_union! { | ||
| pub (crate) JsObjectPatternLike = JsObjectAssignmentPattern | JsObjectBindingPattern | ||
| } | ||
|
|
||
| impl JsObjectPatternLike { | ||
| fn l_curly_token(&self) -> SyntaxResult<JsSyntaxToken> { | ||
| match self { | ||
| JsObjectPatternLike::JsObjectAssignmentPattern(node) => node.l_curly_token(), | ||
| JsObjectPatternLike::JsObjectBindingPattern(node) => node.l_curly_token(), | ||
| } | ||
| } | ||
|
|
||
| fn r_curly_token(&self) -> SyntaxResult<JsSyntaxToken> { | ||
| match self { | ||
| JsObjectPatternLike::JsObjectAssignmentPattern(node) => node.r_curly_token(), | ||
| JsObjectPatternLike::JsObjectBindingPattern(node) => node.r_curly_token(), | ||
| } | ||
| } | ||
|
|
||
| fn write_properties(&self, f: &mut JsFormatter) -> FormatResult<()> { | ||
| match self { | ||
| JsObjectPatternLike::JsObjectAssignmentPattern(node) => { | ||
| write!(f, [node.properties().format()]) | ||
| } | ||
| JsObjectPatternLike::JsObjectBindingPattern(node) => { | ||
| write!(f, [node.properties().format()]) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn should_break_properties(&self) -> SyntaxResult<bool> { | ||
| let has_at_least_a_complex_property = match self { | ||
| JsObjectPatternLike::JsObjectAssignmentPattern(node) => { | ||
| node.properties().iter().any(|property| { | ||
| if let Ok( | ||
| JsAnyObjectAssignmentPatternMember::JsObjectAssignmentPatternProperty(node), | ||
| ) = property | ||
| { | ||
| let pattern = node.pattern(); | ||
| matches!( | ||
| pattern, | ||
| Ok(JsAnyAssignmentPattern::JsObjectAssignmentPattern(_) | ||
| | JsAnyAssignmentPattern::JsArrayAssignmentPattern(_)) | ||
| ) | ||
| } else { | ||
| false | ||
| } | ||
| }) | ||
| } | ||
| JsObjectPatternLike::JsObjectBindingPattern(node) => { | ||
| node.properties().iter().any(|property| { | ||
| if let Ok(JsAnyObjectBindingPatternMember::JsObjectBindingPatternProperty( | ||
| node, | ||
| )) = property | ||
| { | ||
| let pattern = node.pattern(); | ||
| matches!( | ||
| pattern, | ||
| Ok(JsAnyBindingPattern::JsObjectBindingPattern(_) | ||
| | JsAnyBindingPattern::JsArrayBindingPattern(_)) | ||
| ) | ||
| } else { | ||
| false | ||
| } | ||
| }) | ||
| } | ||
| }; | ||
|
|
||
| let parent_kind = self.syntax().parent().map(|p| p.kind()); | ||
|
|
||
| let parent_where_not_to_break = !matches!( | ||
| parent_kind, | ||
| Some( | ||
| // These parents are the kinds where we want to prevent | ||
| // to go to multiple lines. | ||
| JsSyntaxKind::JS_FUNCTION_EXPRESSION | ||
| | JsSyntaxKind::JS_ARROW_FUNCTION_EXPRESSION | ||
| | JsSyntaxKind::JS_OBJECT_ASSIGNMENT_PATTERN_PROPERTY | ||
| | JsSyntaxKind::JS_CATCH_DECLARATION | ||
| | JsSyntaxKind::JS_FUNCTION_DECLARATION | ||
| | JsSyntaxKind::JS_OBJECT_BINDING_PATTERN_PROPERTY | ||
| | JsSyntaxKind::JS_FORMAL_PARAMETER | ||
| ) | ||
| ); | ||
|
|
||
| Ok(parent_where_not_to_break && has_at_least_a_complex_property) | ||
| } | ||
| } | ||
|
|
||
| impl Format<JsFormatContext> for JsObjectPatternLike { | ||
| fn fmt(&self, f: &mut Formatter<JsFormatContext>) -> FormatResult<()> { | ||
| let should_break_properties = self.should_break_properties()?; | ||
|
|
||
| if should_break_properties { | ||
| write!( | ||
| f, | ||
| [ | ||
| &self.l_curly_token()?.format(), | ||
| group_elements(&block_indent(&format_with(|f| { | ||
| self.write_properties(f) | ||
| }),),), | ||
| &self.r_curly_token()?.format(), | ||
| ] | ||
| ) | ||
| } else { | ||
| write!( | ||
| f, | ||
| [format_delimited( | ||
| &self.l_curly_token()?, | ||
| &format_with(|f| { self.write_properties(f) }), | ||
| &self.r_curly_token()?, | ||
| ) | ||
| .soft_block_spaces()] | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.