Fix overlapping disabled ranges edge case (#4497)

lib/__tests__/disableRanges.test.js

@@ -238,6 +238,17 @@ it('disable single line multiple rules', () => {
 	);
 });
 
+it('disable single line one rule and re-enable all', () => {
+	return testDisableRanges(
+		'a {} /* stylelint-disable-line block-no-empty */\n/* stylelint-enable */',
+		() => {
+			throw new Error('should have errored');
+		},
+	).catch((err) => {
+		expect(err.reason).toBe('No rules have been disabled');
+	});
+});
+
 it('disable next line all rules', () => {
 	return testDisableRanges('/* stylelint-disable-next-line */\na {} ').then((result) => {
 		expect(result.stylelint.disabledRanges).toEqual(

lib/__tests__/needlessDisables.test.js

@@ -81,7 +81,7 @@ it('needlessDisables complex case', () => {
 				ranges: [
 					{ start: 5, end: 5, unusedRule: 'color-named' },
 					{ start: 6, end: 6, unusedRule: 'block-no-empty' },
-					{ start: 8, unusedRule: 'block-no-empty' },
+					{ start: 8, end: 10, unusedRule: 'block-no-empty' },
 				],
 			},
 		]);

lib/assignDisabledRanges.js

@@ -95,20 +95,22 @@ module.exports = function(root, result) {
 			});
 		}
 
-		if (ruleIsDisabled(ruleName)) {
-			throw comment.error(`"${ruleName}" has already been disabled`, {
-				plugin: 'stylelint',
-			});
-		}
-
 		if (ruleName === ALL_RULES) {
 			Object.keys(disabledRanges).forEach((disabledRuleName) => {
+				if (ruleIsDisabled(disabledRuleName)) return;
+
 				const strict = disabledRuleName === ALL_RULES;
 
 				startDisabledRange(line, disabledRuleName, strict);
 				endDisabledRange(line, disabledRuleName, strict);
 			});
 		} else {
+			if (ruleIsDisabled(ruleName)) {
+				throw comment.error(`"${ruleName}" has already been disabled`, {
+					plugin: 'stylelint',
+				});
+			}
+
 			startDisabledRange(line, ruleName, true);
 			endDisabledRange(line, ruleName, true);
 		}
@@ -159,8 +161,7 @@ module.exports = function(root, result) {
 			if (ruleToEnable === ALL_RULES) {
 				if (
 					Object.values(disabledRanges).every(
-						// @ts-ignore https://github.com/stylelint/stylelint/issues/4328
-						(ranges) => _.isEmpty(ranges) || Boolean(_.last(ranges.end)),
+						(ranges) => ranges.length === 0 || typeof ranges[ranges.length - 1].end === 'number',
 					)
 				) {
 					throw comment.error('No rules have been disabled', {