Issue#2366 sorted attributes respects comments, cleaned up syntax

jsx-eslint · Aug 16, 2022 · 5c690e0 · 5c690e0
1 parent 51ed373
commit 5c690e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/rules/jsx-sort-props.js b/lib/rules/jsx-sort-props.js
@@ -6,7 +6,6 @@
 'use strict';
 
 const propName = require('jsx-ast-utils/propName');
-//const astUtils = require(".node_modules\eslint\lib\rules\utils\ast-utils.js");
 const includes = require('array-includes');
 const docsUrl = require('../util/docsUrl');
 const jsxUtil = require('../util/jsx');
@@ -29,7 +28,7 @@ const messages = {
   listIsEmpty: 'A customized reserved first list must not be empty',
   listReservedPropsFirst: 'Reserved props must be listed before all other props',
   listCallbacksLast: 'Callbacks must be listed after all other props',
-  listShorthandFirst: 'S horthand props must be listed before all other props',
+  listShorthandFirst: 'Shorthand props must be listed before all other props',
   listShorthandLast: 'Shorthand props must be listed after all other props',
   listMultilineFirst: 'Multiline props must be listed before all other props',
   listMultilineLast: 'Multiline props must be listed after all other props',
@@ -236,7 +235,7 @@ const generateFixerFunction = (node, context, reservedList) => {
   const sortableAttributeGroups = getGroupsOfSortableAttributes(attributes, context);
   const sortedAttributeGroups = sortableAttributeGroups
     .slice(0)
-    .map((group) => group.slice(0).sort((a, b) => contextCompare(a, b, options) ));
+    .map((group) => group.slice(0).sort((a, b) => contextCompare(a, b, options)));
 
   return function fixFunction(fixer) {
     const fixers = [];
@@ -257,7 +256,7 @@ const generateFixerFunction = (node, context, reservedList) => {
     fixers.sort((a, b) => b.range[0] - a.range[0]);
 
     const rangeStart = fixers[fixers.length - 1].range[0];
-    const rangeEnd = fixers[0].range[1]; 
+    const rangeEnd = fixers[0].range[1];
 
     fixers.forEach((fix) => {
       source = `${source.substr(0, fix.range[0])}${fix.text}${source.substr(fix.range[1])}`;
@@ -329,7 +328,6 @@ function reportNodeAttribute(nodeAttribute, errorType, node, context, reservedLi
   report(context, messages[errorType], errorType, {
     node: nodeAttribute.name,
     fix: generateFixerFunction(node, context, reservedList),
-
   });
 }
 

diff --git a/tests/lib/rules/jsx-sort-props.js b/tests/lib/rules/jsx-sort-props.js
@@ -119,7 +119,6 @@ const multilineAndShorthandAndCallbackLastArgs = [
     callbacksLast: true,
   },
 ];
-//const commentbetween = [{ commentbetween: true }];
 
 ruleTester.run('jsx-sort-props', rule, {
   valid: parsers.all([].concat(