JavaScript - fix a few issues in autoformatting logic (#5728)

* Handling ES/SE prefix and markers

* Fixing handling of spaces before parens in method invocations

* Handling prefixes of ExpressionStatements

* Enabling the test again

Author: greg-at-moderne

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

@@ -290,7 +290,7 @@ export class SpacesVisitor<P> extends JavaScriptVisitor<P> {
         const ret = await super.visitMethodInvocation(methodInv, p) as J.MethodInvocation;
         return produceAsync(ret, async draft => {
             if (draft.select) {
-                draft.select = await this.spaceAfterRightPadded(draft.select, this.style.beforeParentheses.functionCallParentheses);
+                draft.arguments = await this.spaceBeforeContainer(draft.arguments, this.style.beforeParentheses.functionCallParentheses);
             }
             if (ret.arguments.elements.length > 0 && ret.arguments.elements[0].element.kind != J.Kind.Empty) {
                 draft.arguments.elements = await Promise.all(draft.arguments.elements.map(async (arg, index) => {
@@ -1030,7 +1030,11 @@ export class BlankLinesVisitor<P> extends JavaScriptVisitor<P> {
 
     private ensurePrefixHasNewLine<T extends J>(node: Draft<J>) {
         if (node.prefix && !node.prefix.whitespace.includes("\n")) {
-            node.prefix.whitespace = "\n" + node.prefix.whitespace;
+            if (node.kind === JS.Kind.ExpressionStatement) {
+                this.ensurePrefixHasNewLine((node as JS.ExpressionStatement).expression);
+            } else {
+                node.prefix.whitespace = "\n" + node.prefix.whitespace;
+            }
         }
     }
 

rewrite-javascript/rewrite/src/javascript/print.ts

@@ -75,13 +75,15 @@ export class JavaScriptPrinter extends JavaScriptVisitor<PrintOutputCapture> {
     }
 
     override async visitExpressionStatement(statement: JS.ExpressionStatement, p: PrintOutputCapture): Promise<J | undefined> {
-        // has no markers or prefix
+        await this.visitSpace(statement.prefix, p);
+        await this.visitMarkers(statement.markers, p);
         await this.visit(statement.expression, p);
         return statement;
     }
 
     override async visitStatementExpression(statementExpression: JS.StatementExpression, p: PrintOutputCapture): Promise<J | J | undefined> {
-        // has no markers or prefix
+        await this.visitSpace(statementExpression.prefix, p);
+        await this.visitMarkers(statementExpression.markers, p);
         await this.visit(statementExpression.statement, p);
         return statementExpression;
     }

rewrite-javascript/rewrite/test/javascript/format/format.test.ts

@@ -22,8 +22,7 @@ describe('AutoformatVisitor', () => {
     const spec = new RecipeSpec()
     spec.recipe = fromVisitor(new AutoformatVisitor());
 
-    // FIXME enable again once we've fixed `StatementExpression` and `ExpressionStatement` handling
-    test.skip('everything', () => {
+    test('everything', () => {
         return spec.rewriteRun(
             // TODO there should be no newline after the default case in switch
             // TODO not sure if there should be a newline after the if and after the finally