Rename some keywords according stylelint's new names

at-rule-nested-empty-line-before "blockless-group" → "blockless-after-blockless" comment-empty-line-before "between-comments" → "after-comment" "stylelint-commands" → "stylelint-command" stylelint/stylelint#1663 (comment) 9
hudochenkov · Jan 8, 2017 · af21204 · af21204
1 parent e25ef72
commit af21204
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -579,7 +579,7 @@ function plugin(css, opts) {
 
 			// Optionally ignore the expectation if the node is blockless
 			if (
-				checkOption(optionName, 'ignore', 'blockless-group')
+				checkOption(optionName, 'ignore', 'blockless-after-blockless')
 				&& isBlocklessAfterBlockless()
 			) {
 				return;
@@ -615,7 +615,7 @@ function plugin(css, opts) {
 			}
 
 			if (
-				checkOption(optionName, 'except', 'blockless-group')
+				checkOption(optionName, 'except', 'blockless-after-blockless')
 				&& isBlocklessAfterBlockless()
 			) {
 				expectEmptyLineBefore = !expectEmptyLineBefore;
@@ -728,7 +728,7 @@ function plugin(css, opts) {
 					// Optionally ignore stylelint commands
 					if (
 						comment.text.indexOf('stylelint-') === 0
-						&& checkOption(optionName, 'ignore', 'stylelint-commands')
+						&& checkOption(optionName, 'ignore', 'stylelint-command')
 					) {
 						return;
 					}
@@ -739,7 +739,7 @@ function plugin(css, opts) {
 					if (
 						prev
 						&& prev.type === 'comment'
-						&& checkOption(optionName, 'ignore', 'between-comments')
+						&& checkOption(optionName, 'ignore', 'after-comment')
 					) {
 						return;
 					}

diff --git a/lib/validateOptions.js b/lib/validateOptions.js
@@ -344,8 +344,8 @@ function validateAtRuleNestedEmptyLineBefore(options) {
 
 	if (!validateSecondaryOptions({
 		options,
-		exceptPossible: ['blockless-after-same-name-blockless', 'blockless-group', 'first-nested', 'after-same-name'],
-		ignorePossible: ['blockless-after-same-name-blockless', 'blockless-group', 'after-comment'],
+		exceptPossible: ['blockless-after-same-name-blockless', 'blockless-after-blockless', 'first-nested', 'after-same-name'],
+		ignorePossible: ['blockless-after-same-name-blockless', 'blockless-after-blockless', 'after-comment'],
 	})) {
 		return false;
 	}
@@ -381,7 +381,7 @@ function validateCommentEmptyLineBefore(options) {
 	if (!validateSecondaryOptions({
 		options,
 		exceptPossible: ['first-nested'],
-		ignorePossible: ['between-comments', 'stylelint-commands'],
+		ignorePossible: ['after-comment', 'stylelint-command'],
 	})) {
 		return false;
 	}

diff --git a/test/at-rule-nested-empty-line-before.js b/test/at-rule-nested-empty-line-before.js
@@ -146,7 +146,7 @@ groupTest([
 	},
 	{
 		options: {
-			'at-rule-nested-empty-line-before': [true, { except: ['blockless-group'] }]
+			'at-rule-nested-empty-line-before': [true, { except: ['blockless-after-blockless'] }]
 		},
 		cases: mergeTestCases(sharedAlwaysTests, [
 			{
@@ -188,7 +188,7 @@ groupTest([
 	},
 	{
 		options: {
-			'at-rule-nested-empty-line-before': [true, { ignore: ['blockless-group'] }]
+			'at-rule-nested-empty-line-before': [true, { ignore: ['blockless-after-blockless'] }]
 		},
 		cases: mergeTestCases(sharedAlwaysTests, [
 			{
@@ -268,7 +268,7 @@ groupTest([
 	},
 	{
 		options: {
-			'at-rule-nested-empty-line-before': [false, { except: ['blockless-group'] }]
+			'at-rule-nested-empty-line-before': [false, { except: ['blockless-after-blockless'] }]
 		},
 		cases: mergeTestCases(sharedNeverTests, [
 			{
@@ -326,7 +326,7 @@ groupTest([
 	},
 	{
 		options: {
-			'at-rule-nested-empty-line-before': [false, { ignore: ['blockless-group'] }]
+			'at-rule-nested-empty-line-before': [false, { ignore: ['blockless-after-blockless'] }]
 		},
 		cases: [
 			{

diff --git a/test/comment-empty-line-before.js b/test/comment-empty-line-before.js
@@ -84,7 +84,7 @@ groupTest([
 	},
 	{
 		options: {
-			'comment-empty-line-before': [true, { ignore: ['stylelint-commands'] }]
+			'comment-empty-line-before': [true, { ignore: ['stylelint-command'] }]
 		},
 		cases: mergeTestCases(sharedAlwaysTests, [
 			{
@@ -96,7 +96,7 @@ groupTest([
 	},
 	{
 		options: {
-			'comment-empty-line-before': [true, { ignore: ['between-comments'] }]
+			'comment-empty-line-before': [true, { ignore: ['after-comment'] }]
 		},
 		cases: [
 			{

diff --git a/test/validate-options.js b/test/validate-options.js
@@ -831,7 +831,7 @@ testConfig({
 	config: {
 		'at-rule-nested-empty-line-before': [
 			{
-				except: ['blockless-group'],
+				except: ['blockless-after-blockless'],
 			},
 		],
 	},
@@ -844,7 +844,7 @@ testConfig({
 		'at-rule-nested-empty-line-before': [
 			false,
 			{
-				except: ['blockless-group'],
+				except: ['blockless-after-blockless'],
 			},
 		],
 	},
@@ -857,7 +857,7 @@ testConfig({
 		'at-rule-nested-empty-line-before': [
 			true,
 			{
-				except: ['blockless-group-sdfsffsd'],
+				except: ['blockless-after-blockless-sdfsffsd'],
 			},
 		],
 	},