@mrhenry/stylelint-mrhenry-prop-order 3.0.10 → 3.0.12

package/index.mjs

@@ -49,8 +49,7 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 				parent = parent.parent;
 			}
 
-			/* c8 ignore next */
-			// Comments after a node, not one a new line should be kept together with that node.
+			// Comments after a node, not on a new line should be kept together with that node.
 			// color: red; /* my color */
 			let matchedComments = new Map();
 			container.each((node) => {
@@ -60,13 +59,16 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 
 					if (prev) {
 						matchedComments.set(comment, prev);
-						comment.remove();
 					}
 				}
 			});
 
 			let declarationsSections = [[]];
 			container.each((node) => {
+				if (matchedComments.has(node)) {
+					return;
+				}
+
 				if (
 					node.type === 'decl' &&
 					!node.variable &&
@@ -89,46 +91,52 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 			});
 
 			declarationsSections.forEach((section) => {
-				section.sort((a, b) => {
+				const sortedSection = [...section];
+				sortedSection.sort((a, b) => {
 					return order.indexOf(a.prop.toLowerCase()) - order.indexOf(b.prop.toLowerCase());
 				});
 
 				const firstNodeIndex = Math.min.apply(Math, section.map((x) => container.index(x)));
 				const originalFirstNode = container.nodes[firstNodeIndex];
 
-				section.forEach((decl, index) => {
-					const desiredIndex = firstNodeIndex + index;
-					if (container.index(decl) === desiredIndex) {
-						return;
-					}
+				if (!context.fix) {
+					sortedSection.forEach((decl, index) => {
+						const oldIndex = section.indexOf(decl);
+						if (index === oldIndex) {
+							return;
+						}
+
+						if (index < section.length - 1) {
+							stylelint.utils.report({
+								message: messages.expected(decl.prop),
+								node: decl,
+								index: 0,
+								endIndex: decl.prop.length,
+								result: postcssResult,
+								ruleName,
+							});
+						}
+					});
+				}
 
-					if (context.fix) {
-						container.insertBefore(desiredIndex, decl);
+				if (context.fix) {
+					sortedSection.reverse().forEach((decl) => {
+						container.insertBefore(firstNodeIndex, decl);
 						return;
+					});
+					
+					const finalFirstNode = container.nodes[firstNodeIndex];
+					if (originalFirstNode.raws.before && finalFirstNode.raws.before) {
+						const originalRawBefore = originalFirstNode.raws.before;
+						originalFirstNode.raws.before = finalFirstNode.raws.before;
+						finalFirstNode.raws.before = originalRawBefore;
 					}
-
-					if (index < section.length - 1) {
-						stylelint.utils.report({
-							message: messages.expected(decl.prop),
-							node: decl,
-							index: 0,
-							endIndex: decl.prop.length,
-							result: postcssResult,
-							ruleName,
-						});
-					}
-				});
-
-				const finalFirstNode = container.nodes[firstNodeIndex];
-				if (originalFirstNode.raws.before && finalFirstNode.raws.before) {
-					const originalRawBefore = originalFirstNode.raws.before;
-					originalFirstNode.raws.before = finalFirstNode.raws.before;
-					finalFirstNode.raws.before = originalRawBefore;
 				}
 			});
 
 			if (context.fix) {
 				for (const [comment, prev] of matchedComments) {
+					comment.remove();
 					container.insertAfter(prev, comment);
 				}
 			}

package/order.mjs

@@ -436,8 +436,8 @@ export const order = [
 	"position",
 	"position-anchor",
 	"position-try",
-	"position-try-options",
 	"position-try-order",
+	"position-try-fallbacks",
 	"position-visibility",
 	"print-color-adjust",
 	"quotes",
@@ -489,13 +489,10 @@ export const order = [
 	"scroll-start-x",
 	"scroll-start-y",
 	"scroll-start-target",
-	"scroll-start-target-inline",
-	"scroll-start-target-block",
-	"scroll-start-target-x",
-	"scroll-start-target-y",
 	"scroll-timeline",
 	"scroll-timeline-axis",
 	"scroll-timeline-name",
+	'scroll-marker-group',
 	"scrollbar-color",
 	"scrollbar-gutter",
 	"scrollbar-width",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/stylelint-mrhenry-prop-order",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "description": "Mr. Henry's preferred order for CSS properties",
   "type": "module",
   "main": "index.mjs",
@@ -30,6 +30,6 @@
     "stylelint": "^16.0.0"
   },
   "devDependencies": {
-    "stylelint": "^16.6.1"
+    "stylelint": "^16.7.0"
   }
 }