Fix range format for function bodies (#13173)

thorn0 · web-flow · commit cd9955f1431c · 2022-07-25T12:28:24.000+03:00
diff --git a/changelog_unreleased/javascript/13173.md b/changelog_unreleased/javascript/13173.md
@@ -0,0 +1,20 @@
+#### Fix range format for function bodies (#13173 by @thorn0)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+let fn = (() => {
+  return; //
+//^^^^^^^^^^ - range
+});
+
+// Prettier stable
+let fn = (() => {
+  return; //
+};);
+
+// Prettier main
+let fn = (() => {
+  return; //
+});
+```
diff --git a/src/main/range-util.js b/src/main/range-util.js
@@ -64,6 +64,9 @@ function findSiblingAncestors(
     } else {
       break;
     }
+    if (resultStartNode === resultEndNode) {
+      break;
+    }
   }
 
   return {
diff --git a/tests/format/js/range/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/range/__snapshots__/jsfmt.spec.js.snap
@@ -182,6 +182,27 @@ rangeStart: 0
 ================================================================================
 `;
 
+exports[`function-body.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 33
+rangeStart: 20
+     |                                                                                | printWidth
+=====================================input======================================
+  1 | let fn =a((x ) => {
+> 2 |   quux (); //
+    | ^^^^^^^^^^^^^
+  3 | });
+  4 |
+=====================================output=====================================
+let fn =a((x ) => {
+  quux(); //
+});
+
+================================================================================
+`;
+
 exports[`function-declaration.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
diff --git a/tests/format/js/range/function-body.js b/tests/format/js/range/function-body.js
@@ -0,0 +1,3 @@
+let fn =a((x ) => {
+<<<PRETTIER_RANGE_START>>>  quux (); //<<<PRETTIER_RANGE_END>>>
+});

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ function findSiblingAncestors(`
`64`	`64`	`} else {`
`65`	`65`	`break;`
`66`	`66`	`}`
	`67`	`+ if (resultStartNode === resultEndNode) {`
	`68`	`+ break;`
	`69`	`+ }`
`67`	`70`	`}`
`68`	`71`
`69`	`72`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+let fn =a((x ) => {`
	`2`	`+<<<PRETTIER_RANGE_START>>> quux (); //<<<PRETTIER_RANGE_END>>>`
	`3`	`+});`