Improve require() call with comments (#18037)

changelog_unreleased/javascript/18037.md

@@ -0,0 +1,35 @@
+#### Improve `require()` call with comments (#18037 by @fisker)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+require(
+// Comment
+"foo"
+);
+
+call(
+// Comment
+"foo"
+);
+
+// Prettier stable
+require(// Comment
+"foo");
+
+call(
+  // Comment
+  "foo",
+);
+
+// Prettier main
+require(
+  // Comment
+  "foo",
+);
+
+call(
+  // Comment
+  "foo",
+);
+```

src/language-js/print/call-expression.js

@@ -172,7 +172,10 @@ function isCommonsJsOrAmdModuleDefinition(path) {
 
   // AMD module
   if (node.callee.name === "require") {
-    return (args.length === 1 && isStringLiteral(args[0])) || args.length > 1;
+    return (
+      ((args.length === 1 && isStringLiteral(args[0])) || args.length > 1) &&
+      !hasComment(args[0])
+    );
   }
 
   // CommonJS module

tests/format/js/require/__snapshots__/format.test.js.snap

@@ -1,5 +1,47 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
+exports[`comments.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+require(
+// 1
+"foo"
+);
+require.resolve(// 2
+"foo");
+require.resolve.paths(// 3
+"foo");
+
+call(
+// 4
+"foo"
+);
+
+=====================================output=====================================
+require(
+  // 1
+  "foo",
+);
+require.resolve(
+  // 2
+  "foo",
+);
+require.resolve.paths(
+  // 3
+  "foo",
+);
+
+call(
+  // 4
+  "foo",
+);
+
+================================================================================
+`;
+
 exports[`long-module-name.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]

tests/format/js/require/comments.js

@@ -0,0 +1,13 @@
+require(
+// 1
+"foo"
+);
+require.resolve(// 2
+"foo");
+require.resolve.paths(// 3
+"foo");
+
+call(
+// 4
+"foo"
+);