Skip to content

Commit

Permalink
Make error message fit better for eslint-plugin-prettier
Browse files Browse the repository at this point in the history
It’s not about the rule’s options, it’s about other config (another
rules being enabled).
  • Loading branch information
lydell committed Nov 30, 2020
1 parent bc65d43 commit 7642c58
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function processRules(configRules) {
].join("\n");

const optionsMessage = [
"The following rules are enabled with options that might conflict with Prettier. See:",
"The following rules are enabled with config that might conflict with Prettier. See:",
SPECIAL_RULES_URL,
"",
printRuleNames(optionsFlaggedRuleNames),
Expand Down
6 changes: 3 additions & 3 deletions test/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ test("conflicting options", () => {
expect(cli.processRules(createRules(rules, "error"))).toMatchInlineSnapshot(`
Object {
"code": 2,
"stdout": "The following rules are enabled with options that might conflict with Prettier. See:
"stdout": "The following rules are enabled with config that might conflict with Prettier. See:
https://github.com/prettier/eslint-config-prettier#special-rules
- curly",
Expand Down Expand Up @@ -140,7 +140,7 @@ test("all the things", () => {
- flowtype/semi
- react/jsx-indent
The following rules are enabled with options that might conflict with Prettier. See:
The following rules are enabled with config that might conflict with Prettier. See:
https://github.com/prettier/eslint-config-prettier#special-rules
- curly
Expand Down Expand Up @@ -170,7 +170,7 @@ test("eslint-plugin-prettier", () => {
).toMatchInlineSnapshot(`
Object {
"code": 2,
"stdout": "The following rules are enabled with options that might conflict with Prettier. See:
"stdout": "The following rules are enabled with config that might conflict with Prettier. See:
https://github.com/prettier/eslint-config-prettier#special-rules
- arrow-body-style
Expand Down

0 comments on commit 7642c58

Please sign in to comment.