Fixed cases.

openrewrite · Nov 15, 2023 · c58f6ae · c58f6ae
1 parent b1fd1cb
commit c58f6ae
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java b/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java
@@ -733,24 +733,27 @@ private J.ClassDeclaration visitClassDeclaration(TSCNode node) {
     private J visitCaseClause(TSCNode node) {
         TSCNode expression = node.getOptionalNodeProperty("expression");
         List<TSCNode> statements = node.getNodeListProperty("statements");
-        List<JRightPadded<Statement>> list = new ArrayList<>();
+        Space prefix = whitespace();
+        JContainer<Expression> expressions = JContainer.build(
+                expression == null ? EMPTY : sourceBefore(TSCSyntaxKind.CaseKeyword),
+                singletonList(JRightPadded.build((Expression) visitNode(expression))),
+                Markers.EMPTY
+        );
+        List<JRightPadded<Statement>> list = new ArrayList<>(statements.size());
+        Space before = sourceBefore(TSCSyntaxKind.ColonToken);
         for (TSCNode it : statements) {
             JRightPadded<Statement> statementJRightPadded = maybeSemicolon((Statement) visitNode(it));
             list.add(statementJRightPadded);
         }
         return new J.Case(
                 randomId(),
-                whitespace(),
+                prefix,
                 Markers.EMPTY,
                 J.Case.Type.Statement,
                 null,
+                expressions,
                 JContainer.build(
-                        expression == null ? EMPTY : sourceBefore(TSCSyntaxKind.CaseKeyword),
-                        singletonList(JRightPadded.build((Expression) visitNode(expression))),
-                        Markers.EMPTY
-                ),
-                JContainer.build(
-                        sourceBefore(TSCSyntaxKind.ColonToken),
+                        before,
                         list,
                         Markers.EMPTY
                 ),
@@ -859,24 +862,27 @@ private J.Annotation visitDecorator(TSCNode node) {
 
     private J visitDefaultClause(TSCNode node) {
         List<TSCNode> statements = node.getNodeListProperty("statements");
-        List<JRightPadded<Statement>> list = new ArrayList<>();
+        Space prefix = whitespace();
+        JContainer<Expression> expressions = JContainer.build(
+                EMPTY,
+                singletonList(JRightPadded.build(new J.Identifier(randomId(), sourceBefore(TSCSyntaxKind.DefaultKeyword), Markers.EMPTY, emptyList(), "default", null, null))),
+                Markers.EMPTY
+        );
+        Space before = sourceBefore(TSCSyntaxKind.ColonToken);
+        List<JRightPadded<Statement>> list = new ArrayList<>(statements.size());
         for (TSCNode it : statements) {
             JRightPadded<Statement> statementJRightPadded = maybeSemicolon((Statement) visitNode(it));
             list.add(statementJRightPadded);
         }
         return new J.Case(
                 randomId(),
-                whitespace(),
+                prefix,
                 Markers.EMPTY,
                 J.Case.Type.Statement,
                 null,
+                expressions,
                 JContainer.build(
-                        EMPTY,
-                        singletonList(JRightPadded.build(new J.Identifier(randomId(), sourceBefore(TSCSyntaxKind.DefaultKeyword), Markers.EMPTY, emptyList(), "default", null, null))),
-                        Markers.EMPTY
-                ),
-                JContainer.build(
-                        sourceBefore(TSCSyntaxKind.ColonToken),
+                        before,
                         list,
                         Markers.EMPTY
                 ),