feat(formatter): implement formatting for TSTupletype (#14019)

Author: Dunqing

crates/oxc_formatter/src/write/mod.rs

@@ -26,6 +26,7 @@ mod sequence_expression;
 mod switch_statement;
 mod template;
 mod try_statement;
+mod tuple_type;
 mod type_parameters;
 mod union_type;
 mod utils;
@@ -45,7 +46,7 @@ use oxc_ast::{AstKind, ast::*};
 use oxc_span::GetSpan;
 
 use crate::{
-    best_fitting, format_args,
+    Expand, best_fitting, format_args,
     formatter::{
         Buffer, Format, FormatResult, Formatter,
         prelude::*,
@@ -1246,19 +1247,6 @@ impl<'a> FormatWrite<'a> for AstNode<'a, TSIndexedAccessType<'a>> {
     }
 }
 
-impl<'a> FormatWrite<'a> for AstNode<'a, TSTupleType<'a>> {
-    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
-        write!(f, "[")?;
-        for (i, ty) in self.element_types().iter().enumerate() {
-            if i != 0 {
-                write!(f, [",", space()])?;
-            }
-            write!(f, ty)?;
-        }
-        write!(f, "]")
-    }
-}
-
 impl<'a> FormatWrite<'a> for AstNode<'a, TSNamedTupleMember<'a>> {
     fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
         write!(f, self.label())?;

crates/oxc_formatter/src/write/tuple_type.rs

@@ -0,0 +1,37 @@
+use oxc_allocator::Vec;
+use oxc_ast::ast::*;
+
+use crate::{
+    Expand, Format, FormatResult, FormatTrailingCommas,
+    formatter::{Formatter, prelude::*, trivia::format_dangling_comments},
+    generated::ast_nodes::AstNode,
+    write,
+};
+
+use super::FormatWrite;
+
+impl<'a> Format<'a> for AstNode<'a, Vec<'a, TSTupleElement<'a>>> {
+    fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
+        f.join_nodes_with_soft_line()
+            .entries_with_trailing_separator(self.iter(), ",", trailing_separator)
+            .finish()
+    }
+}
+
+impl<'a> FormatWrite<'a> for AstNode<'a, TSTupleType<'a>> {
+    fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
+        write!(f, "[")?;
+
+        let element_types = self.element_types();
+        if element_types.is_empty() {
+            write!(f, [format_dangling_comments(self.span).with_block_indent()])?;
+        } else {
+            let should_expand = f.options().expand == Expand::Always;
+
+            write!(f, [group(&soft_block_indent(&element_types)).should_expand(should_expand)])?;
+        }
+
+        write!(f, "]")
+    }
+}

tasks/coverage/snapshots/formatter_typescript.snap

@@ -2,7 +2,7 @@ commit: 261630d6
 
 formatter_typescript Summary:
 AST Parsed     : 8816/8816 (100.00%)
-Positive Passed: 8791/8816 (99.72%)
+Positive Passed: 8792/8816 (99.73%)
 Mismatch: tasks/coverage/typescript/tests/cases/compiler/amdLikeInputDeclarationEmit.ts
 
 Expect to Parse: tasks/coverage/typescript/tests/cases/compiler/arrayFromAsync.ts
@@ -51,5 +51,3 @@ Mismatch: tasks/coverage/typescript/tests/cases/conformance/interfaces/interface
 
 Mismatch: tasks/coverage/typescript/tests/cases/conformance/statements/returnStatements/returnStatementNoAsiAfterTransform.ts
 
-Mismatch: tasks/coverage/typescript/tests/cases/conformance/types/tuple/named/namedTupleMembers.ts
-

tasks/prettier_conformance/snapshots/prettier.ts.snap.md

@@ -1,4 +1,4 @@
-ts compatibility: 467/573 (81.50%)
+ts compatibility: 473/573 (82.55%)
 
 # Failed
 
@@ -14,7 +14,6 @@ ts compatibility: 467/573 (81.50%)
 | typescript/angular-component-examples/test.component.ts | 💥💥 | 41.18% |
 | typescript/arrow/16067.ts | 💥💥 | 95.92% |
 | typescript/arrow/comments.ts | 💥✨ | 44.44% |
-| typescript/as/as.ts | 💥 | 96.18% |
 | typescript/as/expression-statement.ts | 💥 | 75.00% |
 | typescript/assignment/issue-10848.tsx | 💥 | 63.86% |
 | typescript/assignment/issue-10850.ts | 💥 | 50.00% |
@@ -91,14 +90,10 @@ ts compatibility: 467/573 (81.50%)
 | typescript/prettier-ignore/prettier-ignore-nested-unions.ts | 💥 | 29.17% |
 | typescript/prettier-ignore/prettier-ignore-parenthesized-type.ts | 💥 | 0.00% |
 | typescript/rest-type/complex.ts | 💥 | 0.00% |
-| typescript/rest-type/infer-type.ts | 💥 | 64.00% |
 | typescript/satisfies-operators/expression-statement.ts | 💥💥 | 78.38% |
 | typescript/satisfies-operators/lhs.ts | 💥✨ | 35.00% |
-| typescript/tuple/dangling-comments.ts | 💥💥💥 | 21.28% |
 | typescript/tuple/trailing-comma-for-empty-tuples.ts | 💥💥💥 | 16.67% |
-| typescript/tuple/trailing-comma-trailing-rest.ts | 💥💥💥 | 0.00% |
-| typescript/tuple/trailing-comma.ts | 💥💥💥 | 61.54% |
-| typescript/tuple/tuple.ts | 💥💥💥 | 0.00% |
+| typescript/tuple/tuple.ts | 💥💥💥 | 87.50% |
 | typescript/type-alias/conditional.ts | 💥 | 38.10% |
 | typescript/type-alias/issue-9874.ts | 💥 | 0.00% |
 | typescript/type-arguments-bit-shift-left-like/3.ts | 💥 | 0.00% |
@@ -108,5 +103,4 @@ ts compatibility: 467/573 (81.50%)
 | typescript/union/inlining.ts | 💥 | 79.70% |
 | typescript/union/union-parens.ts | 💥 | 92.59% |
 | typescript/union/consistent-with-flow/prettier-ignore.ts | 💥 | 38.30% |
-| typescript/union/consistent-with-flow/within-tuple.ts | 💥 | 17.50% |
 | typescript/union/single-type/single-type.ts | 💥 | 66.67% |