-
-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(prettier): Verify printing member expr (#8797)
Part of #5068 - MemberExpression - Computed - Static, PrivateField
- Loading branch information
Showing
5 changed files
with
122 additions
and
29 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| use oxc_allocator::Vec; | ||
| use oxc_ast::ast::*; | ||
|
|
||
| use crate::{array, group, indent, ir::Doc, softline, text, Format, Prettier}; | ||
|
|
||
| #[allow(clippy::enum_variant_names)] | ||
| pub enum MemberExpressionLike<'a, 'b> { | ||
| ComputedMemberExpression(&'b ComputedMemberExpression<'a>), | ||
| StaticMemberExpression(&'b StaticMemberExpression<'a>), | ||
| PrivateFieldExpression(&'b PrivateFieldExpression<'a>), | ||
| } | ||
|
|
||
| impl<'a> MemberExpressionLike<'a, '_> { | ||
| pub fn format_object(&self, p: &mut Prettier<'a>) -> Doc<'a> { | ||
| match self { | ||
| MemberExpressionLike::ComputedMemberExpression(expr) => expr.object.format(p), | ||
| MemberExpressionLike::StaticMemberExpression(expr) => expr.object.format(p), | ||
| MemberExpressionLike::PrivateFieldExpression(expr) => expr.object.format(p), | ||
| } | ||
| } | ||
|
|
||
| pub fn optional(&self) -> bool { | ||
| match self { | ||
| MemberExpressionLike::ComputedMemberExpression(expr) => expr.optional, | ||
| MemberExpressionLike::StaticMemberExpression(expr) => expr.optional, | ||
| MemberExpressionLike::PrivateFieldExpression(expr) => expr.optional, | ||
| } | ||
| } | ||
|
|
||
| pub fn format_property(&self, p: &mut Prettier<'a>) -> Doc<'a> { | ||
| match self { | ||
| MemberExpressionLike::ComputedMemberExpression(expr) => expr.expression.format(p), | ||
| MemberExpressionLike::StaticMemberExpression(expr) => expr.property.format(p), | ||
| MemberExpressionLike::PrivateFieldExpression(expr) => expr.field.format(p), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn print_member_expression<'a>( | ||
| p: &mut Prettier<'a>, | ||
| member_expr: &MemberExpressionLike<'a, '_>, | ||
| ) -> Doc<'a> { | ||
| let mut parts = Vec::new_in(p.allocator); | ||
|
|
||
| parts.push(member_expr.format_object(p)); | ||
|
|
||
| let lookup_doc = print_member_lookup(p, member_expr); | ||
|
|
||
| // TODO: Calc `shouldInline` with parent | ||
| let should_inline = true; | ||
|
|
||
| if should_inline { | ||
| parts.push(lookup_doc); | ||
| } else { | ||
| parts.push(group!(p, [indent!(p, [softline!(), lookup_doc])])); | ||
| } | ||
|
|
||
| // TODO: Wrap with `label!` when in member-chain | ||
| array!(p, parts) | ||
| } | ||
|
|
||
| pub fn print_member_lookup<'a>( | ||
| p: &mut Prettier<'a>, | ||
| member_expr: &MemberExpressionLike<'a, '_>, | ||
| ) -> Doc<'a> { | ||
| match member_expr { | ||
| MemberExpressionLike::StaticMemberExpression(_) | ||
| | MemberExpressionLike::PrivateFieldExpression(_) => { | ||
| let mut parts = Vec::new_in(p.allocator); | ||
| if member_expr.optional() { | ||
| parts.push(text!("?")); | ||
| } | ||
| parts.push(text!(".")); | ||
| parts.push(member_expr.format_property(p)); | ||
| array!(p, parts) | ||
| } | ||
| MemberExpressionLike::ComputedMemberExpression(expr) => { | ||
| if expr.expression.is_number_literal() { | ||
| let mut parts = Vec::new_in(p.allocator); | ||
| if expr.optional { | ||
| parts.push(text!("?.")); | ||
| } | ||
| parts.push(text!("[")); | ||
| parts.push(expr.expression.format(p)); | ||
| parts.push(text!("]")); | ||
| return array!(p, parts); | ||
| } | ||
|
|
||
| let mut parts = Vec::new_in(p.allocator); | ||
| if expr.optional { | ||
| parts.push(text!("?.")); | ||
| } | ||
| parts.push(text!("[")); | ||
| parts.push(indent!(p, [softline!(), expr.expression.format(p)])); | ||
| parts.push(softline!()); | ||
| parts.push(text!("]")); | ||
|
|
||
| group!(p, parts) | ||
| } | ||
| } | ||
| } |
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