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 664
fix(rome_js_formatter): Fix stackoverflow on Windows for nested seque… #2469
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
44 changes: 39 additions & 5 deletions
44
crates/rome_js_formatter/src/js/expressions/sequence_expression.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,25 +1,59 @@ | ||
use crate::formatter_traits::FormatTokenAndNode; | ||
use rome_formatter::concat_elements; | ||
|
||
use crate::{ | ||
format_elements, space_token, FormatElement, FormatResult, Formatter, ToFormatElement, | ||
}; | ||
|
||
use rome_js_syntax::JsSequenceExpression; | ||
use rome_js_syntax::JsSequenceExpressionFields; | ||
use rome_js_syntax::{JsSequenceExpression, JsSequenceExpressionFields}; | ||
use rome_rowan::AstNode; | ||
|
||
impl ToFormatElement for JsSequenceExpression { | ||
fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> { | ||
let mut current = self.clone(); | ||
|
||
// Find the left most sequence expression | ||
while let Some(sequence_expression) = | ||
JsSequenceExpression::cast(current.left()?.syntax().clone()) | ||
{ | ||
current = sequence_expression; | ||
} | ||
|
||
// Format the left most sequence expression | ||
let JsSequenceExpressionFields { | ||
left, | ||
comma_token, | ||
right, | ||
} = self.as_fields(); | ||
} = current.as_fields(); | ||
|
||
Ok(format_elements![ | ||
let mut formatted = vec![ | ||
left.format(formatter)?, | ||
comma_token.format(formatter)?, | ||
space_token(), | ||
right.format(formatter)?, | ||
]) | ||
]; | ||
|
||
// Traverse upwards again and concatenate the sequence expression until we find the first non-sequence expression | ||
while let Some(parent) = current.syntax().parent() { | ||
if let Some(parent_sequence) = JsSequenceExpression::cast(parent) { | ||
let JsSequenceExpressionFields { | ||
left: _left, | ||
comma_token, | ||
right, | ||
} = parent_sequence.as_fields(); | ||
|
||
formatted.push(format_elements![ | ||
comma_token.format(formatter)?, | ||
space_token(), | ||
right.format(formatter)? | ||
]); | ||
|
||
current = parent_sequence; | ||
} else { | ||
break; | ||
} | ||
} | ||
|
||
Ok(concat_elements(formatted)) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we use
_
already when we want to ignore a node