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

package/dist/src/rules/blank-line-after-variable-declaration.d.ts

@@ -1,6 +1,7 @@
 /**
  * 連続する変数宣言の後に別の種類の文が続く場合、空行を 1 行以上確保します。
  *
+ * 宣言した変数を使う式文は同じ宣言グループとして扱い、グループ内の空行は削除します。
  * return の直前は blank-line-before-return が担当するため対象外にします。
  */
 declare const blankLineAfterVariableDeclaration: import("vite-plus/lint/plugins").Rule;

package/dist/src/rules/blank-line-after-variable-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blank-line-after-variable-declaration.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line-after-variable-declaration.ts"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH,QAAA,MAAM,iCAAiC,uCA0DrC,CAAC;eAEY,iCAAiC"}
+{"version":3,"file":"blank-line-after-variable-declaration.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line-after-variable-declaration.ts"],"names":[],"mappings":"AA8CA;;;;;GAKG;AACH,QAAA,MAAM,iCAAiC,uCA8GrC,CAAC;eAEY,iCAAiC"}

package/dist/src/rules/blank-line-after-variable-declaration.js

@@ -1,49 +1,105 @@
 import { defineRule } from "vite-plus/lint/plugins";
-import { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, } from "./blank-line.js";
-function isVariableDeclarationStatement(node) {
+import { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, } from "./blank-line.js";
+function getVariableDeclaration(node) {
     if (node.type === "VariableDeclaration") {
-        return true;
+        return node;
     }
-    return node.type === "ExportNamedDeclaration" && node.declaration?.type === "VariableDeclaration";
+    if (node.type === "ExportNamedDeclaration" && node.declaration?.type === "VariableDeclaration") {
+        return node.declaration;
+    }
+    return null;
+}
+function isRelatedExpression(statement, variables) {
+    if (statement.type !== "ExpressionStatement") {
+        return false;
+    }
+    for (const variable of variables) {
+        for (const reference of variable.references) {
+            if (reference.identifier.range[0] >= statement.range[0] &&
+                reference.identifier.range[1] <= statement.range[1]) {
+                return true;
+            }
+        }
+    }
+    return false;
 }
 /**
  * 連続する変数宣言の後に別の種類の文が続く場合、空行を 1 行以上確保します。
  *
+ * 宣言した変数を使う式文は同じ宣言グループとして扱い、グループ内の空行は削除します。
  * return の直前は blank-line-before-return が担当するため対象外にします。
  */
 const blankLineAfterVariableDeclaration = defineRule({
     meta: {
         docs: {
-            description: "Require a blank line after a variable declaration group when another statement follows.",
+            description: "Require a blank line after a variable declaration group and remove blank lines before related statements.",
         },
         type: "layout",
         fixable: "whitespace",
         messages: {
             blankLine: "Expected a blank line after a variable declaration group when another statement follows.",
+            unexpectedBlankLine: "Expected no blank line between a variable declaration and its related statement.",
         },
     },
     create(context) {
         const sourceCode = context.sourceCode;
         function checkStatement(node) {
+            const variableDeclaration = getVariableDeclaration(node);
+            if (variableDeclaration === null) {
+                return;
+            }
             if (node.type === "VariableDeclaration" && node.parent.type === "ExportNamedDeclaration") {
                 return;
             }
-            const nextStatement = getNextStatement(node);
+            const previousStatement = getPreviousStatement(node);
+            if (previousStatement !== null && getVariableDeclaration(previousStatement) !== null) {
+                return;
+            }
+            const variables = new Set(sourceCode.getDeclaredVariables(variableDeclaration));
+            let last = node;
+            let nextStatement = getNextStatement(last);
+            while (nextStatement !== null) {
+                const nextVariableDeclaration = getVariableDeclaration(nextStatement);
+                if (nextVariableDeclaration !== null && getVariableDeclaration(last) !== null) {
+                    for (const variable of sourceCode.getDeclaredVariables(nextVariableDeclaration)) {
+                        variables.add(variable);
+                    }
+                    last = nextStatement;
+                    nextStatement = getNextStatement(last);
+                    continue;
+                }
+                if (nextStatement.type === "ExpressionStatement" &&
+                    isRelatedExpression(nextStatement, variables)) {
+                    const target = getInsertionTarget(last, nextStatement, sourceCode);
+                    if (hasBlankLine(last, target)) {
+                        context.report({
+                            fix(fixer) {
+                                return getRemoveBlankLineFix(fixer, sourceCode, last, target);
+                            },
+                            node: nextStatement,
+                            messageId: "unexpectedBlankLine",
+                        });
+                    }
+                    last = nextStatement;
+                    nextStatement = getNextStatement(last);
+                    continue;
+                }
+                break;
+            }
             if (nextStatement === null ||
                 nextStatement.type === "EmptyStatement" ||
-                nextStatement.type === "ReturnStatement" ||
-                isVariableDeclarationStatement(nextStatement)) {
+                nextStatement.type === "ReturnStatement") {
                 return;
             }
-            const target = getInsertionTarget(node, nextStatement, sourceCode);
-            if (hasBlankLine(node, target)) {
+            const target = getInsertionTarget(last, nextStatement, sourceCode);
+            if (hasBlankLine(last, target)) {
                 return;
             }
             context.report({
                 fix(fixer) {
-                    return getBlankLineFix(fixer, sourceCode, node, target);
+                    return getBlankLineFix(fixer, sourceCode, last, target);
                 },
-                node,
+                node: nextStatement,
                 messageId: "blankLine",
             });
         }

package/dist/src/rules/blank-line.d.ts

@@ -10,5 +10,9 @@ declare function getPreviousStatement(node: ESTree.Node): ESTree.Node | null;
 declare function getInsertionTarget(node: ESTree.Node, nextStatement: ESTree.Node, sourceCode: SourceCode): ESTree.Node | Comment;
 declare function hasBlankLine(node: ESTree.Node, target: ESTree.Node | Comment): boolean;
 declare function getBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
-export { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, };
+/**
+ * 指定したノードと対象の間の空行を削除します。
+ */
+declare function getRemoveBlankLineFix(fixer: Fixer, sourceCode: SourceCode, node: ESTree.Node, target: ESTree.Node | Comment): Fix | null;
+export { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, };
 //# sourceMappingURL=blank-line.d.ts.map

package/dist/src/rules/blank-line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blank-line.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4BtF,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAc/D;AAED,iBAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAcnE;AAED;;;;;GAKG;AACH,iBAAS,kBAAkB,CACzB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,aAAa,EAAE,MAAM,CAAC,IAAI,EAC1B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,IAAI,GAAG,OAAO,CAWvB;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,OAAO,CAE/E;AAED,iBAAS,eAAe,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAYZ;AAED,OAAO,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,GACrB,CAAC"}
+{"version":3,"file":"blank-line.d.ts","sourceRoot":"","sources":["../../../src/rules/blank-line.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4BtF,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAc/D;AAED,iBAAS,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,CAcnE;AAED;;;;;GAKG;AACH,iBAAS,kBAAkB,CACzB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,aAAa,EAAE,MAAM,CAAC,IAAI,EAC1B,UAAU,EAAE,UAAU,GACrB,MAAM,CAAC,IAAI,GAAG,OAAO,CAWvB;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAAG,OAAO,CAE/E;AAED,iBAAS,eAAe,CACtB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAYZ;AAED;;GAEG;AACH,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,GAC5B,GAAG,GAAG,IAAI,CAmBZ;AAED,OAAO,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GACtB,CAAC"}

package/dist/src/rules/blank-line.js

@@ -65,4 +65,22 @@ function getBlankLineFix(fixer, sourceCode, node, target) {
     }
     return fixer.insertTextBeforeRange([lineEnd, lineEnd + 1], "\n");
 }
-export { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, };
+/**
+ * 指定したノードと対象の間の空行を削除します。
+ */
+function getRemoveBlankLineFix(fixer, sourceCode, node, target) {
+    if (target.loc.start.line <= node.loc.end.line + 1) {
+        return null;
+    }
+    const fromLineEnd = sourceCode.text.indexOf("\n", node.range[1]);
+    if (fromLineEnd === -1) {
+        return null;
+    }
+    const targetLineStart = sourceCode.text.lastIndexOf("\n", target.range[0]) + 1;
+    const indent = sourceCode.text.slice(targetLineStart, target.range[0]);
+    if (indent.trim() !== "") {
+        return null;
+    }
+    return fixer.replaceTextRange([fromLineEnd, target.range[0]], `\n${indent}`);
+}
+export { hasBlankLine, getBlankLineFix, getNextStatement, getInsertionTarget, getPreviousStatement, getRemoveBlankLineFix, };

package/dist/src/rules/comment-one-sentence-per-line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment-one-sentence-per-line.d.ts","sourceRoot":"","sources":["../../../src/rules/comment-one-sentence-per-line.ts"],"names":[],"mappings":"AAiKA;;;;;GAKG;AACH,QAAA,MAAM,yBAAyB,uCA8F7B,CAAC;eAEY,yBAAyB"}
+{"version":3,"file":"comment-one-sentence-per-line.d.ts","sourceRoot":"","sources":["../../../src/rules/comment-one-sentence-per-line.ts"],"names":[],"mappings":"AAiKA;;;;;GAKG;AACH,QAAA,MAAM,yBAAyB,uCA6F7B,CAAC;eAEY,yBAAyB"}

package/dist/src/rules/jsdoc-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsdoc-utils.d.ts","sourceRoot":"","sources":["../../../src/rules/jsdoc-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAI1E,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI/C;AAyBD;;GAEG;AACH,iBAAS,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBpD;AAED;;;;GAIG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,EAAE,GAAG,IAAI,CA+DnF;AAED,iBAAS,iBAAiB,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAE/D;AAcD;;GAEG;AACH,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,GAAG,IAAI,CAmB/E;AAED,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"jsdoc-utils.d.ts","sourceRoot":"","sources":["../../../src/rules/jsdoc-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAI1E,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI/C;AAyBD;;GAEG;AACH,iBAAS,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBpD;AAED;;;;GAIG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,SAAS,EAAE,GAAG,IAAI,CA8DnF;AAED,iBAAS,iBAAiB,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAE/D;AAcD;;GAEG;AACH,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,GAAG,IAAI,CAmB/E;AAED,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC"}

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,CAwLjB;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/overload-signatures-adjacent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overload-signatures-adjacent.d.ts","sourceRoot":"","sources":["../../../src/rules/overload-signatures-adjacent.ts"],"names":[],"mappings":"AAiGA;;GAEG;AACH,QAAA,MAAM,0BAA0B,uCAqG9B,CAAC;eAEY,0BAA0B"}
+{"version":3,"file":"overload-signatures-adjacent.d.ts","sourceRoot":"","sources":["../../../src/rules/overload-signatures-adjacent.ts"],"names":[],"mappings":"AAuEA;;GAEG;AACH,QAAA,MAAM,0BAA0B,uCAqG9B,CAAC;eAEY,0BAA0B"}

package/dist/src/rules/overload-signatures-adjacent.js

@@ -1,5 +1,5 @@
 import { defineRule } from "vite-plus/lint/plugins";
-import { getNextStatement } from "./blank-line.js";
+import { getNextStatement, getRemoveBlankLineFix } from "./blank-line.js";
 function getFunction(node) {
     if (node.type === "FunctionDeclaration" || node.type === "TSDeclareFunction") {
         return node;
@@ -25,21 +25,6 @@ function getKeyName(node) {
     }
     return null;
 }
-function getRemoveBlankLinesFix(fixer, sourceCode, previous, next) {
-    if (next.loc.start.line <= previous.loc.end.line + 1) {
-        return null;
-    }
-    const fromLineEnd = sourceCode.text.indexOf("\n", previous.range[1]);
-    if (fromLineEnd === -1) {
-        return null;
-    }
-    const nextLineStart = sourceCode.text.lastIndexOf("\n", next.range[0]) + 1;
-    const indent = sourceCode.text.slice(nextLineStart, next.range[0]);
-    if (indent.trim() !== "") {
-        return null;
-    }
-    return fixer.replaceTextRange([fromLineEnd, next.range[0]], `\n${indent}`);
-}
 function hasCommentBetween(sourceCode, previous, next) {
     return sourceCode
         .getAllComments()
@@ -52,7 +37,7 @@ function reportIfSeparated(context, sourceCode, previous, next) {
     }
     context.report({
         fix(fixer) {
-            return getRemoveBlankLinesFix(fixer, sourceCode, previous, next);
+            return getRemoveBlankLineFix(fixer, sourceCode, previous, next);
         },
         node: next,
         messageId: "adjacent",

package/dist/src/rules/sort-jsx-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-jsx-props.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-jsx-props.ts"],"names":[],"mappings":"AAsEA;;;GAGG;AACH,QAAA,MAAM,YAAY,uCAwEhB,CAAC;eAEY,YAAY"}
+{"version":3,"file":"sort-jsx-props.d.ts","sourceRoot":"","sources":["../../../src/rules/sort-jsx-props.ts"],"names":[],"mappings":"AAsEA;;;GAGG;AACH,QAAA,MAAM,YAAY,uCAuEhB,CAAC;eAEY,YAAY"}

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/dist/src/rules/spaced-comment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spaced-comment.d.ts","sourceRoot":"","sources":["../../../src/rules/spaced-comment.ts"],"names":[],"mappings":"AAyBA;;GAEG;AACH,QAAA,MAAM,aAAa,uCAkGjB,CAAC;eAEY,aAAa"}
+{"version":3,"file":"spaced-comment.d.ts","sourceRoot":"","sources":["../../../src/rules/spaced-comment.ts"],"names":[],"mappings":"AAyBA;;GAEG;AACH,QAAA,MAAM,aAAa,uCAgGjB,CAAC;eAEY,aAAa"}

package/package.json

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

package/src/rules/blank-line-after-variable-declaration.ts

@@ -1,69 +1,150 @@
 import { defineRule } from "vite-plus/lint/plugins";
-import type { ESTree } from "vite-plus/lint/plugins";
+import type { ESTree, Variable } from "vite-plus/lint/plugins";
 
 import {
   hasBlankLine,
   getBlankLineFix,
   getNextStatement,
   getInsertionTarget,
+  getPreviousStatement,
+  getRemoveBlankLineFix,
 } from "./blank-line.js";
 
-function isVariableDeclarationStatement(node: ESTree.Node): boolean {
+function getVariableDeclaration(node: ESTree.Node): ESTree.VariableDeclaration | null {
   if (node.type === "VariableDeclaration") {
-    return true;
+    return node;
   }
 
-  return node.type === "ExportNamedDeclaration" && node.declaration?.type === "VariableDeclaration";
+  if (node.type === "ExportNamedDeclaration" && node.declaration?.type === "VariableDeclaration") {
+    return node.declaration;
+  }
+
+  return null;
+}
+
+function isRelatedExpression(
+  statement: ESTree.Statement,
+  variables: ReadonlySet<Variable>,
+): boolean {
+  if (statement.type !== "ExpressionStatement") {
+    return false;
+  }
+
+  for (const variable of variables) {
+    for (const reference of variable.references) {
+      if (
+        reference.identifier.range[0] >= statement.range[0] &&
+        reference.identifier.range[1] <= statement.range[1]
+      ) {
+        return true;
+      }
+    }
+  }
+
+  return false;
 }
 
 /**
  * 連続する変数宣言の後に別の種類の文が続く場合、空行を 1 行以上確保します。
  *
+ * 宣言した変数を使う式文は同じ宣言グループとして扱い、グループ内の空行は削除します。
  * return の直前は blank-line-before-return が担当するため対象外にします。
  */
 const blankLineAfterVariableDeclaration = defineRule({
   meta: {
     docs: {
       description:
-        "Require a blank line after a variable declaration group when another statement follows.",
+        "Require a blank line after a variable declaration group and remove blank lines before related statements.",
     },
     type: "layout",
     fixable: "whitespace",
     messages: {
       blankLine:
         "Expected a blank line after a variable declaration group when another statement follows.",
+      unexpectedBlankLine:
+        "Expected no blank line between a variable declaration and its related statement.",
     },
   },
   create(context) {
     const sourceCode = context.sourceCode;
 
     function checkStatement(node: ESTree.Node): void {
+      const variableDeclaration = getVariableDeclaration(node);
+
+      if (variableDeclaration === null) {
+        return;
+      }
+
       if (node.type === "VariableDeclaration" && node.parent.type === "ExportNamedDeclaration") {
         return;
       }
 
-      const nextStatement = getNextStatement(node);
+      const previousStatement = getPreviousStatement(node);
+
+      if (previousStatement !== null && getVariableDeclaration(previousStatement) !== null) {
+        return;
+      }
+
+      const variables = new Set<Variable>(sourceCode.getDeclaredVariables(variableDeclaration));
+      let last = node;
+      let nextStatement = getNextStatement(last);
+
+      while (nextStatement !== null) {
+        const nextVariableDeclaration = getVariableDeclaration(nextStatement);
+
+        if (nextVariableDeclaration !== null && getVariableDeclaration(last) !== null) {
+          for (const variable of sourceCode.getDeclaredVariables(nextVariableDeclaration)) {
+            variables.add(variable);
+          }
+
+          last = nextStatement;
+          nextStatement = getNextStatement(last);
+          continue;
+        }
+
+        if (
+          nextStatement.type === "ExpressionStatement" &&
+          isRelatedExpression(nextStatement, variables)
+        ) {
+          const target = getInsertionTarget(last, nextStatement, sourceCode);
+
+          if (hasBlankLine(last, target)) {
+            context.report({
+              fix(fixer) {
+                return getRemoveBlankLineFix(fixer, sourceCode, last, target);
+              },
+              node: nextStatement,
+              messageId: "unexpectedBlankLine",
+            });
+          }
+
+          last = nextStatement;
+          nextStatement = getNextStatement(last);
+          continue;
+        }
+
+        break;
+      }
 
       if (
         nextStatement === null ||
         nextStatement.type === "EmptyStatement" ||
-        nextStatement.type === "ReturnStatement" ||
-        isVariableDeclarationStatement(nextStatement)
+        nextStatement.type === "ReturnStatement"
       ) {
         return;
       }
 
-      const target = getInsertionTarget(node, nextStatement, sourceCode);
+      const target = getInsertionTarget(last, nextStatement, sourceCode);
 
-      if (hasBlankLine(node, target)) {
+      if (hasBlankLine(last, target)) {
         return;
       }
 
       context.report({
         fix(fixer) {
-          return getBlankLineFix(fixer, sourceCode, node, target);
+          return getBlankLineFix(fixer, sourceCode, last, target);
         },
-        node,
+        node: nextStatement,
         messageId: "blankLine",
       });
     }

package/src/rules/blank-line.ts

@@ -104,10 +104,40 @@ function getBlankLineFix(
   return fixer.insertTextBeforeRange([lineEnd, lineEnd + 1], "\n");
 }
 
+/**
+ * 指定したノードと対象の間の空行を削除します。
+ */
+function getRemoveBlankLineFix(
+  fixer: Fixer,
+  sourceCode: SourceCode,
+  node: ESTree.Node,
+  target: ESTree.Node | Comment,
+): Fix | null {
+  if (target.loc.start.line <= node.loc.end.line + 1) {
+    return null;
+  }
+
+  const fromLineEnd = sourceCode.text.indexOf("\n", node.range[1]);
+
+  if (fromLineEnd === -1) {
+    return null;
+  }
+
+  const targetLineStart = sourceCode.text.lastIndexOf("\n", target.range[0]) + 1;
+  const indent = sourceCode.text.slice(targetLineStart, target.range[0]);
+
+  if (indent.trim() !== "") {
+    return null;
+  }
+
+  return fixer.replaceTextRange([fromLineEnd, target.range[0]], `\n${indent}`);
+}
+
 export {
   hasBlankLine,
   getBlankLineFix,
   getNextStatement,
   getInsertionTarget,
   getPreviousStatement,
+  getRemoveBlankLineFix,
 };

package/src/rules/comment-one-sentence-per-line.ts

@@ -129,7 +129,6 @@ function collectDiagnostics(
     if (next !== undefined && next !== null && canContinue(content, next)) {
       const nextLeadingSpace = /^\s*/u.exec(next.content)?.[0] ?? "";
       const separator = nextLeadingSpace === "" && needsSpace(content, next.content) ? " " : "";
-
       fixes.push({
         end: next.start,
         loc: {
@@ -145,6 +144,7 @@ function collectDiagnostics(
         text: separator,
         start: info.end,
       });
+
       continue;
     }
 
@@ -205,7 +205,6 @@ const commentOneSentencePerLine = defineRule({
 
       for (const info of diagnostics.missingPunctuation) {
         const column = info.column + info.content.trimEnd().length;
-
         context.report({
           loc: {
             end: {

package/src/rules/jsdoc-utils.ts

@@ -101,13 +101,13 @@ function getJSDocLines(comment: Comment, sourceCode: SourceCode): JSDocLine[] |
       const closeIndex = line.lastIndexOf("*/");
       const contentEnd = closeIndex === -1 ? line.length : Math.max(contentStart, closeIndex);
       const content = line.slice(contentStart, contentEnd);
-
       lines.push({
         raw: line,
         prefix: line.slice(0, contentStart),
         content,
         tagName: getTagName(content),
       });
+
       continue;
     }
 
@@ -122,7 +122,6 @@ function getJSDocLines(comment: Comment, sourceCode: SourceCode): JSDocLine[] |
     const closeIndex = line.lastIndexOf("*/");
     const contentEnd = closeIndex === -1 ? line.length : Math.max(contentStart, closeIndex);
     const content = line.slice(contentStart, contentEnd);
-
     lines.push({
       raw: line,
       prefix,

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[] {
@@ -130,19 +145,46 @@ function compareUnits(left: NamedSortUnit, right: NamedSortUnit): number {
 
 function sortGroup(group: readonly SortUnit[]): SortUnit[] {
   const sortable = group.filter((unit): unit is NamedSortUnit => unit.name !== null);
-
   sortable.sort(compareUnits);
+
   const rest = group.filter((unit) => unit.name === null);
 
   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) {
@@ -181,13 +221,14 @@ function getSortPlan(
 
     for (const property of node.properties) {
       const isRest = property.type === "RestElement";
-
       units.push({
         name: isRest ? null : getPropertyName(property),
         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 {
@@ -202,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;
 
@@ -222,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;
         }
 
@@ -238,22 +278,41 @@ 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;
-      const isRest = property.type === "RestElement";
+      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;
     }
 
@@ -273,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/overload-signatures-adjacent.ts

@@ -1,7 +1,7 @@
 import { defineRule } from "vite-plus/lint/plugins";
-import type { Fix, Fixer, ESTree, Context, SourceCode } from "vite-plus/lint/plugins";
+import type { ESTree, Context, SourceCode } from "vite-plus/lint/plugins";
 
-import { getNextStatement } from "./blank-line.js";
+import { getNextStatement, getRemoveBlankLineFix } from "./blank-line.js";
 
 function getFunction(node: ESTree.Node): ESTree.Function | null {
   if (node.type === "FunctionDeclaration" || node.type === "TSDeclareFunction") {
@@ -37,32 +37,6 @@ function getKeyName(node: ESTree.MethodDefinition): string | null {
   return null;
 }
 
-function getRemoveBlankLinesFix(
-  fixer: Fixer,
-  sourceCode: SourceCode,
-  previous: ESTree.Node,
-  next: ESTree.Node,
-): Fix | null {
-  if (next.loc.start.line <= previous.loc.end.line + 1) {
-    return null;
-  }
-
-  const fromLineEnd = sourceCode.text.indexOf("\n", previous.range[1]);
-
-  if (fromLineEnd === -1) {
-    return null;
-  }
-
-  const nextLineStart = sourceCode.text.lastIndexOf("\n", next.range[0]) + 1;
-  const indent = sourceCode.text.slice(nextLineStart, next.range[0]);
-
-  if (indent.trim() !== "") {
-    return null;
-  }
-
-  return fixer.replaceTextRange([fromLineEnd, next.range[0]], `\n${indent}`);
-}
-
 function hasCommentBetween(
   sourceCode: SourceCode,
   previous: ESTree.Node,
@@ -88,7 +62,7 @@ function reportIfSeparated(
 
   context.report({
     fix(fixer) {
-      return getRemoveBlankLinesFix(fixer, sourceCode, previous, next);
+      return getRemoveBlankLineFix(fixer, sourceCode, previous, next);
     },
     node: next,
     messageId: "adjacent",

package/src/rules/sort-jsx-props.ts

@@ -130,7 +130,6 @@ const sortJsxProps = defineRule({
         const separator = multiline
           ? `\n${getLineIndent(sourceCode.text, firstAttribute.range[0])}`
           : " ";
-
         context.report({
           fix(fixer) {
             return fixer.replaceTextRange(

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,

package/src/rules/sort-type-members.ts

@@ -176,8 +176,8 @@ function splitGroups(units: readonly MemberUnit[]): MemberUnit[][] {
 
 function sortGroup(group: readonly MemberUnit[]): MemberUnit[] {
   const sortable = group.filter((unit): unit is NamedUnit => unit.name !== null);
-
   sortable.sort((left, right) => compareNames(left.name, right.name));
+
   const rest = group.filter((unit) => unit.name === null);
 
   return [...sortable, ...rest];

package/src/rules/spaced-comment.ts

@@ -70,7 +70,6 @@ const spacedComment = defineRule({
         const contentStart = prefixLength;
         const contentEnd = raw.lastIndexOf("*/");
         const content = raw.slice(contentStart, contentEnd);
-
         needsLeading = content !== "" && !isWhitespace(content[0]);
         needsTrailing = content !== "" && !isWhitespace(content.at(-1));
       } else {
@@ -79,7 +78,6 @@ const spacedComment = defineRule({
         const leadingContent = firstLine.slice(prefixLength);
         const closeIndex = lastLine.lastIndexOf("*/");
         const trailingContent = lastLine.slice(0, closeIndex);
-
         needsLeading = leadingContent !== "" && !isWhitespace(leadingContent[0]);
         needsTrailing = trailingContent !== "" && !isWhitespace(trailingContent.at(-1));
       }