From b63e4ff0f5b1e87bf9522247b844fe3615c8cde7 Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:13:33 -0500 Subject: [PATCH 1/7] [declaration-property-value-disallowed-list] Added support for messageArgs --- lib/rules/declaration-property-value-disallowed-list/README.md | 2 ++ lib/rules/declaration-property-value-disallowed-list/index.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rules/declaration-property-value-disallowed-list/README.md b/lib/rules/declaration-property-value-disallowed-list/README.md index 9f16fdc823..84ae39d0b8 100644 --- a/lib/rules/declaration-property-value-disallowed-list/README.md +++ b/lib/rules/declaration-property-value-disallowed-list/README.md @@ -9,6 +9,8 @@ a { text-transform: uppercase; } * These properties and these values */ ``` +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule. + ## Options `object`: `{ "unprefixed-property-name": ["array", "of", "values", "/regex/", /regex/]|"value"|"/regex/"|/regex/ }` diff --git a/lib/rules/declaration-property-value-disallowed-list/index.js b/lib/rules/declaration-property-value-disallowed-list/index.js index 84a0178f72..b7bd7439db 100644 --- a/lib/rules/declaration-property-value-disallowed-list/index.js +++ b/lib/rules/declaration-property-value-disallowed-list/index.js @@ -52,7 +52,8 @@ const rule = (primary) => { const endIndex = index + decl.value.length; report({ - message: messages.rejected(prop, value), + message: messages.rejected, + messageArgs: [prop, value], node: decl, index, endIndex, From 64ae0eb1d6e747fcc2a538611ddaa6322869493e Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:16:23 -0500 Subject: [PATCH 2/7] [declaration-property-unit-disallowed-list] Added support for messageArgs --- lib/rules/declaration-property-unit-disallowed-list/README.md | 2 ++ lib/rules/declaration-property-unit-disallowed-list/index.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rules/declaration-property-unit-disallowed-list/README.md b/lib/rules/declaration-property-unit-disallowed-list/README.md index f85e11310d..baeb31560c 100644 --- a/lib/rules/declaration-property-unit-disallowed-list/README.md +++ b/lib/rules/declaration-property-unit-disallowed-list/README.md @@ -9,6 +9,8 @@ a { width: 100px; } * These properties and these units */ ``` +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule. + ## Options `object`: `{ "unprefixed-property-name": ["array", "of", "units"]|"unit" }` diff --git a/lib/rules/declaration-property-unit-disallowed-list/index.js b/lib/rules/declaration-property-unit-disallowed-list/index.js index 524a1e1eb2..c7c8b706a3 100644 --- a/lib/rules/declaration-property-unit-disallowed-list/index.js +++ b/lib/rules/declaration-property-unit-disallowed-list/index.js @@ -75,7 +75,8 @@ const rule = (primary) => { const endIndex = index + node.value.length; report({ - message: messages.rejected(prop, unit), + message: messages.rejected, + messageArgs: [prop, unit], node: decl, index, endIndex, From 9e3b30ffccaa0ebe4e0ed94a209be5c7ffb24551 Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:18:04 -0500 Subject: [PATCH 3/7] [function-disallowed-list] Added support for messageArgs --- lib/rules/function-disallowed-list/README.md | 2 ++ lib/rules/function-disallowed-list/index.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rules/function-disallowed-list/README.md b/lib/rules/function-disallowed-list/README.md index 5b577eda82..23e21c5b71 100644 --- a/lib/rules/function-disallowed-list/README.md +++ b/lib/rules/function-disallowed-list/README.md @@ -9,6 +9,8 @@ a { transform: scale(1); } * This function */ ``` +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule. + ## Options `array|string|regex`: `["array", "of", "unprefixed", /functions/, "regex"]|"function"|"/regex/"|/regex/` diff --git a/lib/rules/function-disallowed-list/index.js b/lib/rules/function-disallowed-list/index.js index 394858639e..fa8c7f249d 100644 --- a/lib/rules/function-disallowed-list/index.js +++ b/lib/rules/function-disallowed-list/index.js @@ -50,7 +50,8 @@ const rule = (primary) => { const endIndex = index + node.value.length; report({ - message: messages.rejected(node.value), + message: messages.rejected, + messageArgs: [node.value], node: decl, index, endIndex, From 3dd1ecf1c4796743b616eb959cb488c8a5b8ff9c Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:21:40 -0500 Subject: [PATCH 4/7] [at-rule-disallowed-list] Added support for messageArgs --- lib/rules/at-rule-disallowed-list/README.md | 2 +- lib/rules/at-rule-disallowed-list/index.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/rules/at-rule-disallowed-list/README.md b/lib/rules/at-rule-disallowed-list/README.md index 1c979e20d9..48341b4daf 100644 --- a/lib/rules/at-rule-disallowed-list/README.md +++ b/lib/rules/at-rule-disallowed-list/README.md @@ -9,7 +9,7 @@ Specify a list of disallowed at-rules. * At-rules like this */ ``` -## Options +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule.## Options `array|string`: `["array", "of", "unprefixed", "at-rules"]|"at-rule"` diff --git a/lib/rules/at-rule-disallowed-list/index.js b/lib/rules/at-rule-disallowed-list/index.js index 8b70c0a980..a59a74289f 100644 --- a/lib/rules/at-rule-disallowed-list/index.js +++ b/lib/rules/at-rule-disallowed-list/index.js @@ -43,7 +43,8 @@ const rule = (primary) => { } report({ - message: messages.rejected(name), + message: messages.rejected, + messageArgs: [name], node: atRule, result, ruleName, From 0b2553b2781cbf8f7f0d770ab1a38338fc5a8f28 Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:37:04 -0500 Subject: [PATCH 5/7] [property-disallowed-list] Added support for messageArgs --- lib/rules/property-disallowed-list/README.md | 2 ++ lib/rules/property-disallowed-list/index.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rules/property-disallowed-list/README.md b/lib/rules/property-disallowed-list/README.md index c5da123ef3..d0c95efcdd 100644 --- a/lib/rules/property-disallowed-list/README.md +++ b/lib/rules/property-disallowed-list/README.md @@ -9,6 +9,8 @@ a { text-rendering: optimizeLegibility; } * This property */ ``` +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule. + ## Options `array|string|regex`: `["array", "of", /properties/, "regex"]|"property"|"/regex/"|/regex/` diff --git a/lib/rules/property-disallowed-list/index.js b/lib/rules/property-disallowed-list/index.js index 535ae23c0f..f988278972 100644 --- a/lib/rules/property-disallowed-list/index.js +++ b/lib/rules/property-disallowed-list/index.js @@ -48,7 +48,8 @@ const rule = (primary) => { } report({ - message: messages.rejected(prop), + message: messages.rejected, + messageArgs: [prop], word: prop, node: decl, result, From 0e1e8a73b1b607cd33f42a3f688afa9cdc8d6344 Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 18:59:02 -0500 Subject: [PATCH 6/7] Update change log --- .changeset/several-cucumbers-wonder.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/several-cucumbers-wonder.md diff --git a/.changeset/several-cucumbers-wonder.md b/.changeset/several-cucumbers-wonder.md new file mode 100644 index 0000000000..1dba8a8e44 --- /dev/null +++ b/.changeset/several-cucumbers-wonder.md @@ -0,0 +1,5 @@ +Added: `declaration-property-value-disallowed-list` `messageArgs` support +Added: `declaration-property-unit-disallowed-list` `messageArgs` support +Added: `function-disallowed-list` `messageArgs` support +Added: `at-rule-disallowed-list` `messageArgs` support +Added: `property-disallowed-list` `messageArgs` support From fec6012c21a8c6eaebd25b7faef1f6c17f3edaae Mon Sep 17 00:00:00 2001 From: Chloe Rice Date: Wed, 9 Nov 2022 22:07:30 -0500 Subject: [PATCH 7/7] Rebase and address PR feedback --- .changeset/several-cucumbers-wonder.md | 10 +++++----- lib/rules/at-rule-disallowed-list/README.md | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.changeset/several-cucumbers-wonder.md b/.changeset/several-cucumbers-wonder.md index 1dba8a8e44..2bf3bc64a2 100644 --- a/.changeset/several-cucumbers-wonder.md +++ b/.changeset/several-cucumbers-wonder.md @@ -1,5 +1,5 @@ -Added: `declaration-property-value-disallowed-list` `messageArgs` support -Added: `declaration-property-unit-disallowed-list` `messageArgs` support -Added: `function-disallowed-list` `messageArgs` support -Added: `at-rule-disallowed-list` `messageArgs` support -Added: `property-disallowed-list` `messageArgs` support +--- +"stylelint": minor +--- + +Added: custom message formatting for `at-rule-disallowed-list`, `declaration-property-unit-disallowed-list`, `declaration-property-value-disallowed-list`, `function-disallowed-list`, and `property-disallowed-list` diff --git a/lib/rules/at-rule-disallowed-list/README.md b/lib/rules/at-rule-disallowed-list/README.md index 48341b4daf..efdd373286 100644 --- a/lib/rules/at-rule-disallowed-list/README.md +++ b/lib/rules/at-rule-disallowed-list/README.md @@ -9,7 +9,9 @@ Specify a list of disallowed at-rules. * At-rules like this */ ``` -The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule.## Options +The [`message` secondary option](../../../docs/user-guide/configure.md#message) can accept the arguments of this rule. + +## Options `array|string`: `["array", "of", "unprefixed", "at-rules"]|"at-rule"`