@tai-kun/vp-lint-plugins 0.0.2 → 0.0.3

package/dist/src/rules/object-sort-utils.d.ts

@@ -10,12 +10,23 @@ interface SortPlanOptions {
      */
     forceMultiline?: boolean;
 }
+interface SortEdit {
+    end: number;
+    start: number;
+    text: string;
+}
 type SortPlan = {
+    edits: null;
     needsFix: false;
     replacement: null;
 } | {
+    edits: null;
     needsFix: true;
     replacement: string;
+} | {
+    edits: SortEdit[];
+    needsFix: true;
+    replacement: null;
 };
 declare function compareNames(left: string, right: string): number;
 /**
@@ -24,6 +35,7 @@ declare function compareNames(left: string, right: string): number;
  * - プロパティー名の長さが短い順、同じ長さなら名前順
  * - 空行で区切られたグループ内だけで並び替え
  * - プロパティー直上のコメントはプロパティーと一緒に移動
+ * - 空行を挟んだコメントはグループ見出しとしてその場に残す
  *
  * 並び替えが安全でない場合は null を返します。
  */

package/dist/src/rules/object-sort-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-sort-utils.d.ts","sourceRoot":"","sources":["../../../src/rules/object-sort-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAW,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE1E,KAAK,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC;AAIrE,UAAU,eAAe;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,KAAK,QAAQ,GACT;IACE,QAAQ,EAAE,KAAK,CAAC;IAChB,WAAW,EAAE,IAAI,CAAC;CACnB,GACD;IACE,QAAQ,EAAE,IAAI,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAuEN,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBzD;AAeD;;;;;;;;GAQG;AACH,iBAAS,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,eAAoB,GAC5B,QAAQ,GAAG,IAAI,CAuLjB;AAED,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"object-sort-utils.d.ts","sourceRoot":"","sources":["../../../src/rules/object-sort-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAW,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE1E,KAAK,cAAc,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC;AAIrE,UAAU,eAAe;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,UAAU,QAAQ;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAID,KAAK,QAAQ,GACT;IACE,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,KAAK,CAAC;IAChB,WAAW,EAAE,IAAI,CAAC;CACnB,GACD;IACE,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,IAAI,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,EAAE,IAAI,CAAC;IACf,WAAW,EAAE,IAAI,CAAC;CACnB,CAAC;AAuEN,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBzD;AAyCD;;;;;;;;;GASG;AACH,iBAAS,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,eAAoB,GAC5B,QAAQ,GAAG,IAAI,CAuNjB;AAED,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC"}

package/dist/src/rules/object-sort-utils.js

@@ -73,12 +73,33 @@ function sortGroup(group) {
     const rest = group.filter((unit) => unit.name === null);
     return [...sortable, ...rest];
 }
+function splitGroups(units) {
+    const groups = [];
+    let currentGroup = [];
+    let previousEndLine = null;
+    for (const unit of units) {
+        if (previousEndLine !== null && unit.startLine > previousEndLine + 1) {
+            groups.push(currentGroup);
+            currentGroup = [];
+        }
+        currentGroup.push(unit);
+        previousEndLine = unit.endLine;
+    }
+    if (currentGroup.length > 0) {
+        groups.push(currentGroup);
+    }
+    return groups;
+}
+function getEditText(units) {
+    return units.map((unit) => unit.text).join(",\n");
+}
 /**
  * オブジェクトリテラル／オブジェクトパターンの並び替え計画を返します。
  *
  * - プロパティー名の長さが短い順、同じ長さなら名前順
  * - 空行で区切られたグループ内だけで並び替え
  * - プロパティー直上のコメントはプロパティーと一緒に移動
+ * - 空行を挟んだコメントはグループ見出しとしてその場に残す
  *
  * 並び替えが安全でない場合は null を返します。
  */
@@ -89,7 +110,6 @@ function getSortPlan(node, sourceCode, options = {}) {
     }
     const source = sourceCode.text;
     const lineStarts = getLineStarts(source);
-    const lineIndent = getLineIndent(source, lineStarts, node.loc.start.line);
     const comments = sourceCode
         .getAllComments()
         .filter((comment) => comment.range[0] >= node.range[0] && comment.range[1] <= node.range[1]);
@@ -111,7 +131,9 @@ function getSortPlan(node, sourceCode, options = {}) {
                 text: source.slice(property.range[0], property.range[1]),
                 endLine: property.loc.end.line,
                 property,
+                endOffset: property.range[1],
                 startLine: property.loc.start.line,
+                startOffset: property.range[0],
             });
         }
     }
@@ -122,9 +144,10 @@ function getSortPlan(node, sourceCode, options = {}) {
             const boundary = previous === null ? node.range[0] + 1 : previous.range[1];
             const candidates = comments.filter((comment) => comment.range[0] >= boundary && comment.range[1] <= property.range[0]);
             if (previous !== null &&
-                comments.some((comment) => comment.loc.start.line === previous.loc.end.line &&
-                    comment.range[0] >= previous.range[1] &&
-                    comment.range[1] <= property.range[0])) {
+                candidates.some((comment) => comment.loc.start.line === previous.loc.end.line)) {
+                return null;
+            }
+            if (candidates.some((comment) => comment.loc.start.line === node.loc.start.line)) {
                 return null;
             }
             const attached = [];
@@ -134,31 +157,47 @@ function getSortPlan(node, sourceCode, options = {}) {
                 if (comment === undefined) {
                     continue;
                 }
-                if (comment.loc.end.line !== expectedLine && comment.loc.end.line !== expectedLine - 1) {
+                if (comment.loc.end.line === expectedLine) {
                     return null;
                 }
-                if (comment.loc.start.line === expectedLine) {
-                    return null;
+                if (comment.loc.end.line !== expectedLine - 1) {
+                    break;
                 }
-                if (comment.loc.start.line === node.loc.start.line) {
+                if (comment.loc.start.line === expectedLine) {
                     return null;
                 }
                 attached.unshift(comment);
                 expectedLine = comment.loc.start.line;
             }
-            if (attached.length !== candidates.length) {
-                return null;
-            }
             const first = attached[0] ?? property;
             const startLine = first.loc.start.line;
-            const unitStart = lineStarts[startLine - 1] ?? 0;
+            let startOffset;
+            if (attached.length > 0) {
+                startOffset = lineStarts[startLine - 1] ?? first.range[0];
+            }
+            else if (startLine === previous?.loc.end.line) {
+                startOffset = property.range[0];
+            }
+            else {
+                startOffset = lineStarts[startLine - 1] ?? property.range[0];
+            }
+            let endOffset = property.range[1];
+            while (endOffset > property.range[0]) {
+                const character = source[endOffset - 1];
+                if (character !== "," && character !== ";") {
+                    break;
+                }
+                endOffset -= 1;
+            }
             const isRest = property.type === "RestElement";
             units.push({
                 name: isRest ? null : getPropertyName(property),
-                text: source.slice(unitStart, property.range[1]),
+                text: source.slice(startOffset, endOffset),
                 endLine: property.loc.end.line,
                 property,
+                endOffset,
                 startLine,
+                startOffset,
             });
             previousProperty = property;
         }
@@ -170,52 +209,66 @@ function getSortPlan(node, sourceCode, options = {}) {
             return null;
         }
     }
-    const groups = [];
-    let currentGroup = [];
-    let previousEndLine = null;
-    for (const unit of units) {
-        if (previousEndLine !== null && unit.startLine > previousEndLine + 1) {
-            groups.push(currentGroup);
-            currentGroup = [];
+    if (inlineStart) {
+        const lineIndent = getLineIndent(source, lineStarts, node.loc.start.line);
+        const groups = splitGroups(units);
+        const needsFormat = forceMultiline;
+        const needsSort = groups.some((group) => {
+            const sorted = sortGroup(group);
+            return sorted.some((unit, index) => unit !== group[index]);
+        });
+        if (!needsSort && !needsFormat) {
+            return {
+                edits: null,
+                needsFix: false,
+                replacement: null,
+            };
         }
-        currentGroup.push(unit);
-        previousEndLine = unit.endLine;
-    }
-    if (currentGroup.length > 0) {
-        groups.push(currentGroup);
+        if (singleLine && !forceMultiline) {
+            const sortedUnits = sortGroup(units);
+            return {
+                edits: null,
+                needsFix: true,
+                replacement: `{ ${sortedUnits.map((unit) => unit.text).join(", ")} }`,
+            };
+        }
+        const groupsText = groups.map((group) => getEditText(sortGroup(group))).join(",\n\n");
+        const lastUnit = groups.flatMap((group) => sortGroup(group)).at(-1);
+        const trailingComma = lastUnit?.property.type === "RestElement" ? "" : ",";
+        return {
+            edits: null,
+            needsFix: true,
+            replacement: `{\n${groupsText}${trailingComma}\n${lineIndent}}`,
+        };
     }
-    let needsSort = false;
-    for (const group of groups) {
+    const edits = [];
+    for (const group of splitGroups(units)) {
         const sorted = sortGroup(group);
-        if (sorted.some((unit, index) => unit !== group[index])) {
-            needsSort = true;
-            break;
+        if (sorted.every((unit, index) => unit === group[index])) {
+            continue;
         }
+        const first = group[0];
+        const last = group.at(-1);
+        if (first === undefined || last === undefined) {
+            continue;
+        }
+        edits.push({
+            end: last.endOffset,
+            text: getEditText(sorted),
+            start: first.startOffset,
+        });
     }
-    const needsFormat = forceMultiline && inlineStart;
-    if (!needsSort && !needsFormat) {
+    if (edits.length === 0) {
         return {
+            edits: null,
             needsFix: false,
             replacement: null,
         };
     }
-    if (singleLine && !forceMultiline) {
-        const sortedUnits = sortGroup(units);
-        return {
-            needsFix: true,
-            replacement: `{ ${sortedUnits.map((unit) => unit.text).join(", ")} }`,
-        };
-    }
-    const groupsText = groups
-        .map((group) => sortGroup(group)
-        .map((unit) => unit.text)
-        .join(",\n"))
-        .join(",\n\n");
-    const lastUnit = groups.flatMap((group) => sortGroup(group)).at(-1);
-    const trailingComma = lastUnit?.property.type === "RestElement" ? "" : ",";
     return {
+        edits,
         needsFix: true,
-        replacement: `{\n${groupsText}${trailingComma}\n${lineIndent}}`,
+        replacement: null,
     };
 }
 export { getSortPlan, compareNames };

package/dist/src/rules/sort-object-properties.d.ts

@@ -2,7 +2,7 @@
  * オブジェクトリテラルのプロパティーを、名前の長さが短い順、同じ長さなら名前順に並べます。
  *
  * 空行で区切られたグループは意図的なまとまりとみなし、グループ内だけで並べ替えます。
- * プロパティー直上のコメントはプロパティーと一緒に移動します。
+ * プロパティー直上のコメントはプロパティーと一緒に移動し、空行を挟んだコメントはグループ見出しとして残します。
  */
 declare const sortObjectProperties: import("vite-plus/lint/plugins").Rule;
 export default sortObjectProperties;

package/dist/src/rules/sort-object-properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-object-properties.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-object-properties.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,uCAiDxB,CAAC;eAEY,oBAAoB"}
+{"version":3,"file":"sort-object-properties.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-object-properties.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,uCA6DxB,CAAC;eAEY,oBAAoB"}

package/dist/src/rules/sort-object-properties.js

@@ -4,7 +4,7 @@ import { getSortPlan } from "./object-sort-utils.js";
  * オブジェクトリテラルのプロパティーを、名前の長さが短い順、同じ長さなら名前順に並べます。
  *
  * 空行で区切られたグループは意図的なまとまりとみなし、グループ内だけで並べ替えます。
- * プロパティー直上のコメントはプロパティーと一緒に移動します。
+ * プロパティー直上のコメントはプロパティーと一緒に移動し、空行を挟んだコメントはグループ見出しとして残します。
  */
 const sortObjectProperties = defineRule({
     meta: {
@@ -29,6 +29,9 @@ const sortObjectProperties = defineRule({
                 }
                 context.report({
                     fix(fixer) {
+                        if (plan.edits !== null) {
+                            return plan.edits.map((edit) => fixer.replaceTextRange([edit.start, edit.end], edit.text));
+                        }
                         return fixer.replaceText(node, plan.replacement);
                     },
                     node,
@@ -42,6 +45,9 @@ const sortObjectProperties = defineRule({
                 }
                 context.report({
                     fix(fixer) {
+                        if (plan.edits !== null) {
+                            return plan.edits.map((edit) => fixer.replaceTextRange([edit.start, edit.end], edit.text));
+                        }
                         return fixer.replaceText(node, plan.replacement);
                     },
                     node,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tai-kun/vp-lint-plugins",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "homepage": "https://tai-kun.github.io/vp-lint-plugins/",
   "license": "MIT",

package/src/rules/object-sort-utils.ts

@@ -18,9 +18,17 @@ interface SortPlanOptions {
 
 interface SortUnit {
   endLine: number;
+  endOffset: number;
   name: string | null;
   property: SortableProperty;
   startLine: number;
+  startOffset: number;
+  text: string;
+}
+
+interface SortEdit {
+  end: number;
+  start: number;
   text: string;
 }
 
@@ -28,12 +36,19 @@ type NamedSortUnit = SortUnit & { name: string };
 
 type SortPlan =
   | {
+      edits: null;
       needsFix: false;
       replacement: null;
     }
   | {
+      edits: null;
       needsFix: true;
       replacement: string;
+    }
+  | {
+      edits: SortEdit[];
+      needsFix: true;
+      replacement: null;
     };
 
 function getLineStarts(text: string): number[] {
@@ -137,12 +152,39 @@ function sortGroup(group: readonly SortUnit[]): SortUnit[] {
   return [...sortable, ...rest];
 }
 
+function splitGroups(units: readonly SortUnit[]): SortUnit[][] {
+  const groups: SortUnit[][] = [];
+  let currentGroup: SortUnit[] = [];
+  let previousEndLine: number | null = null;
+
+  for (const unit of units) {
+    if (previousEndLine !== null && unit.startLine > previousEndLine + 1) {
+      groups.push(currentGroup);
+      currentGroup = [];
+    }
+
+    currentGroup.push(unit);
+    previousEndLine = unit.endLine;
+  }
+
+  if (currentGroup.length > 0) {
+    groups.push(currentGroup);
+  }
+
+  return groups;
+}
+
+function getEditText(units: readonly SortUnit[]): string {
+  return units.map((unit) => unit.text).join(",\n");
+}
+
 /**
  * オブジェクトリテラル／オブジェクトパターンの並び替え計画を返します。
  *
  * - プロパティー名の長さが短い順、同じ長さなら名前順
  * - 空行で区切られたグループ内だけで並び替え
  * - プロパティー直上のコメントはプロパティーと一緒に移動
+ * - 空行を挟んだコメントはグループ見出しとしてその場に残す
  *
  * 並び替えが安全でない場合は null を返します。
  */
@@ -159,7 +201,6 @@ function getSortPlan(
 
   const source = sourceCode.text;
   const lineStarts = getLineStarts(source);
-  const lineIndent = getLineIndent(source, lineStarts, node.loc.start.line);
   const comments = sourceCode
     .getAllComments()
     .filter((comment) => comment.range[0] >= node.range[0] && comment.range[1] <= node.range[1]);
@@ -171,7 +212,6 @@ function getSortPlan(
 
   const inlineStart = firstProperty.loc.start.line === node.loc.start.line;
   const singleLine = node.loc.start.line === node.loc.end.line;
-
   const units: SortUnit[] = [];
 
   if (inlineStart) {
@@ -186,7 +226,9 @@ function getSortPlan(
         text: source.slice(property.range[0], property.range[1]),
         endLine: property.loc.end.line,
         property,
+        endOffset: property.range[1],
         startLine: property.loc.start.line,
+        startOffset: property.range[0],
       });
     }
   } else {
@@ -201,16 +243,15 @@ function getSortPlan(
 
       if (
         previous !== null &&
-        comments.some(
-          (comment) =>
-            comment.loc.start.line === previous.loc.end.line &&
-            comment.range[0] >= previous.range[1] &&
-            comment.range[1] <= property.range[0],
-        )
+        candidates.some((comment) => comment.loc.start.line === previous.loc.end.line)
       ) {
         return null;
       }
 
+      if (candidates.some((comment) => comment.loc.start.line === node.loc.start.line)) {
+        return null;
+      }
+
       const attached: Comment[] = [];
       let expectedLine = property.loc.start.line;
 
@@ -221,15 +262,15 @@ function getSortPlan(
           continue;
         }
 
-        if (comment.loc.end.line !== expectedLine && comment.loc.end.line !== expectedLine - 1) {
+        if (comment.loc.end.line === expectedLine) {
           return null;
         }
 
-        if (comment.loc.start.line === expectedLine) {
-          return null;
+        if (comment.loc.end.line !== expectedLine - 1) {
+          break;
         }
 
-        if (comment.loc.start.line === node.loc.start.line) {
+        if (comment.loc.start.line === expectedLine) {
           return null;
         }
 
@@ -237,20 +278,39 @@ function getSortPlan(
         expectedLine = comment.loc.start.line;
       }
 
-      if (attached.length !== candidates.length) {
-        return null;
-      }
-
       const first = attached[0] ?? property;
       const startLine = first.loc.start.line;
-      const unitStart = lineStarts[startLine - 1] ?? 0;
+      let startOffset: number;
+
+      if (attached.length > 0) {
+        startOffset = lineStarts[startLine - 1] ?? first.range[0];
+      } else if (startLine === previous?.loc.end.line) {
+        startOffset = property.range[0];
+      } else {
+        startOffset = lineStarts[startLine - 1] ?? property.range[0];
+      }
+
+      let endOffset = property.range[1];
+
+      while (endOffset > property.range[0]) {
+        const character = source[endOffset - 1];
+
+        if (character !== "," && character !== ";") {
+          break;
+        }
+
+        endOffset -= 1;
+      }
+
       const isRest = property.type === "RestElement";
       units.push({
         name: isRest ? null : getPropertyName(property),
-        text: source.slice(unitStart, property.range[1]),
+        text: source.slice(startOffset, endOffset),
         endLine: property.loc.end.line,
         property,
+        endOffset,
         startLine,
+        startOffset,
       });
 
       previousProperty = property;
@@ -272,66 +332,80 @@ function getSortPlan(
     }
   }
 
-  const groups: SortUnit[][] = [];
-  let currentGroup: SortUnit[] = [];
-  let previousEndLine: number | null = null;
+  if (inlineStart) {
+    const lineIndent = getLineIndent(source, lineStarts, node.loc.start.line);
+    const groups = splitGroups(units);
+    const needsFormat = forceMultiline;
+    const needsSort = groups.some((group) => {
+      const sorted = sortGroup(group);
+
+      return sorted.some((unit, index) => unit !== group[index]);
+    });
+
+    if (!needsSort && !needsFormat) {
+      return {
+        edits: null,
+        needsFix: false,
+        replacement: null,
+      };
+    }
 
-  for (const unit of units) {
-    if (previousEndLine !== null && unit.startLine > previousEndLine + 1) {
-      groups.push(currentGroup);
-      currentGroup = [];
+    if (singleLine && !forceMultiline) {
+      const sortedUnits = sortGroup(units);
+
+      return {
+        edits: null,
+        needsFix: true,
+        replacement: `{ ${sortedUnits.map((unit) => unit.text).join(", ")} }`,
+      };
     }
 
-    currentGroup.push(unit);
-    previousEndLine = unit.endLine;
-  }
+    const groupsText = groups.map((group) => getEditText(sortGroup(group))).join(",\n\n");
+    const lastUnit = groups.flatMap((group) => sortGroup(group)).at(-1);
+    const trailingComma = lastUnit?.property.type === "RestElement" ? "" : ",";
 
-  if (currentGroup.length > 0) {
-    groups.push(currentGroup);
+    return {
+      edits: null,
+      needsFix: true,
+      replacement: `{\n${groupsText}${trailingComma}\n${lineIndent}}`,
+    };
   }
 
-  let needsSort = false;
+  const edits: SortEdit[] = [];
 
-  for (const group of groups) {
+  for (const group of splitGroups(units)) {
     const sorted = sortGroup(group);
 
-    if (sorted.some((unit, index) => unit !== group[index])) {
-      needsSort = true;
-      break;
+    if (sorted.every((unit, index) => unit === group[index])) {
+      continue;
     }
-  }
 
-  const needsFormat = forceMultiline && inlineStart;
+    const first = group[0];
+    const last = group.at(-1);
 
-  if (!needsSort && !needsFormat) {
-    return {
-      needsFix: false,
-      replacement: null,
-    };
-  }
+    if (first === undefined || last === undefined) {
+      continue;
+    }
 
-  if (singleLine && !forceMultiline) {
-    const sortedUnits = sortGroup(units);
+    edits.push({
+      end: last.endOffset,
+      text: getEditText(sorted),
+      start: first.startOffset,
+    });
+  }
 
+  if (edits.length === 0) {
     return {
-      needsFix: true,
-      replacement: `{ ${sortedUnits.map((unit) => unit.text).join(", ")} }`,
+      edits: null,
+      needsFix: false,
+      replacement: null,
     };
   }
 
-  const groupsText = groups
-    .map((group) =>
-      sortGroup(group)
-        .map((unit) => unit.text)
-        .join(",\n"),
-    )
-    .join(",\n\n");
-  const lastUnit = groups.flatMap((group) => sortGroup(group)).at(-1);
-  const trailingComma = lastUnit?.property.type === "RestElement" ? "" : ",";
-
   return {
+    edits,
     needsFix: true,
-    replacement: `{\n${groupsText}${trailingComma}\n${lineIndent}}`,
+    replacement: null,
   };
 }
 

package/src/rules/sort-object-properties.ts

@@ -6,7 +6,7 @@ import { getSortPlan } from "./object-sort-utils.js";
  * オブジェクトリテラルのプロパティーを、名前の長さが短い順、同じ長さなら名前順に並べます。
  *
  * 空行で区切られたグループは意図的なまとまりとみなし、グループ内だけで並べ替えます。
- * プロパティー直上のコメントはプロパティーと一緒に移動します。
+ * プロパティー直上のコメントはプロパティーと一緒に移動し、空行を挟んだコメントはグループ見出しとして残します。
  */
 const sortObjectProperties = defineRule({
   meta: {
@@ -34,6 +34,12 @@ const sortObjectProperties = defineRule({
 
         context.report({
           fix(fixer) {
+            if (plan.edits !== null) {
+              return plan.edits.map((edit) =>
+                fixer.replaceTextRange([edit.start, edit.end], edit.text),
+              );
+            }
+
             return fixer.replaceText(node, plan.replacement);
           },
           node,
@@ -49,6 +55,12 @@ const sortObjectProperties = defineRule({
 
         context.report({
           fix(fixer) {
+            if (plan.edits !== null) {
+              return plan.edits.map((edit) =>
+                fixer.replaceTextRange([edit.start, edit.end], edit.text),
+              );
+            }
+
             return fixer.replaceText(node, plan.replacement);
           },
           node,