Not adding newline in TabsAndIndents block end handling (#5501)

Author: greg-at-moderne

rewrite-javascript/rewrite/src/javascript/format.ts

@@ -1098,7 +1098,7 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
             }
             if (draft.kind === J.Kind.Block) {
                 const block = draft as Draft<J> as Draft<J.Block>;
-                block.end.whitespace = this.newline + relativeIndent;
+                block.end.whitespace = this.combineIndent(block.end.whitespace, relativeIndent);
             }
         });
     }

rewrite-javascript/rewrite/test/javascript/format/tabs-and-indents-visitor.test.ts

@@ -155,7 +155,6 @@ describe('TabsAndIndentsVisitor', () => {
                             switch( s  ){
                                 case "apple"  :
                                     return 1;
-                   
                             }
                             return 0;
                         }
@@ -239,4 +238,50 @@ describe('TabsAndIndentsVisitor', () => {
             // @formatter:on
         )
     })
+
+    test("multi-line callback", () => {
+        const spec = new RecipeSpec()
+        spec.recipe = fromVisitor(new TabsAndIndentsVisitor(tabsAndIndents(draft => {
+        })));
+        return spec.rewriteRun(
+            // @formatter:off
+            //language=typescript
+            typescript(
+                `
+                [1, 2, 3].forEach( x => {
+                console.log(x);
+                });
+                `,
+                `
+                [1, 2, 3].forEach( x => {
+                    console.log(x);
+                });
+                `)
+            // @formatter:on
+        )
+    })
+
+    test("single-line callback with braces", () => {
+        const spec = new RecipeSpec()
+        spec.recipe = fromVisitor(new TabsAndIndentsVisitor(tabsAndIndents(draft => {
+        })));
+        return spec.rewriteRun(
+            // @formatter:off
+            //language=typescript
+            typescript(`[1, 2, 3].forEach(x => {console.log(x)});`)
+            // @formatter:on
+        )
+    })
+
+    test("single-line callback without braces", () => {
+        const spec = new RecipeSpec()
+        spec.recipe = fromVisitor(new TabsAndIndentsVisitor(tabsAndIndents(draft => {
+        })));
+        return spec.rewriteRun(
+            // @formatter:off
+            //language=typescript
+            typescript(`[1, 2, 3].forEach(x => console.log(x));`)
+            // @formatter:on
+        )
+    })
 });