Skip to content

Commit 5eae9de

Browse files
ota-meshiota-meshi
authored
Update report messages (#71)
1 parent eb46f4e commit 5eae9de

File tree

8 files changed

+45
-36
lines changed

8 files changed

+45
-36
lines changed

‎lib/rules/no-useless-character-class.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default createRule("no-useless-character-class", {
107107
? "character"
108108
: element.type === "CharacterClassRange"
109109
? "character class range"
110-
: "character set",
110+
: "character class escape",
111111
additional:
112112
element.type === "CharacterClassRange"
113113
? " and range"

‎lib/rules/prefer-d.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Expression } from "estree"
22
import type { RegExpVisitor } from "regexpp/visitor"
3-
import type { CharacterClassRange, Node as RegExpNode } from "regexpp/ast"
3+
import type { CharacterClass, CharacterClassRange } from "regexpp/ast"
44
import {
55
createRule,
66
defineRegexpVisitor,
@@ -21,7 +21,7 @@ export default createRule("prefer-d", {
2121
schema: [],
2222
messages: {
2323
unexpected:
24-
'Unexpected character set "{{expr}}". Use "{{instead}}" instead.',
24+
'Unexpected {{type}} "{{expr}}". Use "{{instead}}" instead.',
2525
},
2626
type: "suggestion", // "problem",
2727
},
@@ -39,7 +39,8 @@ export default createRule("prefer-d", {
3939
ccrNode.min.value === CP_DIGIT_ZERO &&
4040
ccrNode.max.value === CP_DIGIT_NINE
4141
) {
42-
let reportNode: RegExpNode, instead: string
42+
let reportNode: CharacterClass | CharacterClassRange,
43+
instead: string
4344
const ccNode = ccrNode.parent
4445
if (ccNode.elements.length === 1) {
4546
reportNode = ccNode
@@ -57,6 +58,10 @@ export default createRule("prefer-d", {
5758
),
5859
messageId: "unexpected",
5960
data: {
61+
type:
62+
reportNode.type === "CharacterClass"
63+
? "character class"
64+
: "character class range",
6065
expr: reportNode.raw,
6166
instead,
6267
},

‎lib/rules/prefer-quantifier.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ export default createRule("prefer-quantifier", {
241241
type:
242242
buffer.target.type === "Character"
243243
? "characters"
244-
: "character sets",
244+
: buffer.target.kind === "any"
245+
? "any characters"
246+
: "character class escapes",
245247
quantifier: buffer.getQuantifier(),
246248
},
247249
fix(fixer) {

‎lib/rules/prefer-w.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default createRule("prefer-w", {
7373
schema: [],
7474
messages: {
7575
unexpected:
76-
'Unexpected character set "{{expr}}". Use "{{instead}}" instead.',
76+
'Unexpected {{type}} "{{expr}}". Use "{{instead}}" instead.',
7777
},
7878
type: "suggestion", // "problem",
7979
},
@@ -142,6 +142,7 @@ export default createRule("prefer-w", {
142142
),
143143
messageId: "unexpected",
144144
data: {
145+
type: "character class",
145146
expr: ccNode.raw,
146147
instead,
147148
},
@@ -170,6 +171,7 @@ export default createRule("prefer-w", {
170171
),
171172
messageId: "unexpected",
172173
data: {
174+
type: "character class ranges",
173175
expr: `[${unexpectedElements
174176
.map((e) => e.raw)
175177
.join("")}]`,

‎tests/lib/rules/no-useless-character-class.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ tester.run("no-useless-character-class", rule as any, {
7979
errors: [
8080
{
8181
message:
82-
"Unexpected character class with one character set. Can remove brackets.",
82+
"Unexpected character class with one character class escape. Can remove brackets.",
8383
line: 1,
8484
column: 2,
8585
},
@@ -98,7 +98,7 @@ tester.run("no-useless-character-class", rule as any, {
9898
output: String.raw`/\D/`,
9999
options: [{ ignores: ["\\d"] }],
100100
errors: [
101-
"Unexpected character class with one character set. Can remove brackets.",
101+
"Unexpected character class with one character class escape. Can remove brackets.",
102102
],
103103
},
104104
{

‎tests/lib/rules/prefer-d.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tester.run("prefer-d", rule as any, {
1717
errors: [
1818
{
1919
message:
20-
'Unexpected character set "[0-9]". Use "\\d" instead.',
20+
'Unexpected character class "[0-9]". Use "\\d" instead.',
2121
column: 2,
2222
endColumn: 7,
2323
},
@@ -29,7 +29,7 @@ tester.run("prefer-d", rule as any, {
2929
errors: [
3030
{
3131
message:
32-
'Unexpected character set "[^0-9]". Use "\\D" instead.',
32+
'Unexpected character class "[^0-9]". Use "\\D" instead.',
3333
column: 2,
3434
endColumn: 8,
3535
},
@@ -41,7 +41,7 @@ tester.run("prefer-d", rule as any, {
4141
errors: [
4242
{
4343
message:
44-
'Unexpected character set "0-9". Use "\\d" instead.',
44+
'Unexpected character class range "0-9". Use "\\d" instead.',
4545
column: 4,
4646
endColumn: 7,
4747
},
@@ -56,15 +56,15 @@ tester.run("prefer-d", rule as any, {
5656
const s = "\\\\d"
5757
new RegExp(s)
5858
`,
59-
errors: ['Unexpected character set "[0-9]". Use "\\d" instead.'],
59+
errors: ['Unexpected character class "[0-9]". Use "\\d" instead.'],
6060
},
6161
{
6262
code: `
6363
const s = "[0-"+"9]"
6464
new RegExp(s)
6565
`,
6666
output: null,
67-
errors: ['Unexpected character set "[0-9]". Use "\\d" instead.'],
67+
errors: ['Unexpected character class "[0-9]". Use "\\d" instead.'],
6868
},
6969
],
7070
})

‎tests/lib/rules/prefer-quantifier.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tester.run("prefer-quantifier", rule as any, {
2727
errors: [
2828
{
2929
message:
30-
'Unexpected consecutive same character sets. Use "{2}" instead.',
30+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
3131
line: 1,
3232
column: 2,
3333
endColumn: 6,
@@ -53,7 +53,7 @@ tester.run("prefer-quantifier", rule as any, {
5353
errors: [
5454
{
5555
message:
56-
'Unexpected consecutive same character sets. Use "{1,2}" instead.',
56+
'Unexpected consecutive same character class escapes. Use "{1,2}" instead.',
5757
line: 1,
5858
column: 2,
5959
endColumn: 7,
@@ -66,7 +66,7 @@ tester.run("prefer-quantifier", rule as any, {
6666
errors: [
6767
{
6868
message:
69-
'Unexpected consecutive same character sets. Use "{2,}" instead.',
69+
'Unexpected consecutive same character class escapes. Use "{2,}" instead.',
7070
line: 1,
7171
column: 3,
7272
endColumn: 10,
@@ -77,20 +77,20 @@ tester.run("prefer-quantifier", rule as any, {
7777
code: String.raw`/\d\d\d\d-\d\d-\d\d/`,
7878
output: String.raw`/\d{4}-\d{2}-\d{2}/`,
7979
errors: [
80-
'Unexpected consecutive same character sets. Use "{4}" instead.',
81-
'Unexpected consecutive same character sets. Use "{2}" instead.',
82-
'Unexpected consecutive same character sets. Use "{2}" instead.',
80+
'Unexpected consecutive same character class escapes. Use "{4}" instead.',
81+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
82+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
8383
],
8484
},
8585
{
8686
code: String.raw`/aaa..\s\s\S\S\p{ASCII}\p{ASCII}/u`,
8787
output: String.raw`/a{3}..\s{2}\S\S\p{ASCII}{2}/u`,
8888
errors: [
8989
'Unexpected consecutive same characters. Use "{3}" instead.',
90-
'Unexpected consecutive same character sets. Use "{2}" instead.',
91-
'Unexpected consecutive same character sets. Use "{2}" instead.',
92-
'Unexpected consecutive same character sets. Use "{2}" instead.',
93-
'Unexpected consecutive same character sets. Use "{2}" instead.',
90+
'Unexpected consecutive same any characters. Use "{2}" instead.',
91+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
92+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
93+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
9494
],
9595
},
9696
{
@@ -118,7 +118,7 @@ tester.run("prefer-quantifier", rule as any, {
118118
new RegExp(s)
119119
`,
120120
errors: [
121-
'Unexpected consecutive same character sets. Use "{2}" instead.',
121+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
122122
],
123123
},
124124
{
@@ -128,7 +128,7 @@ tester.run("prefer-quantifier", rule as any, {
128128
`,
129129
output: null,
130130
errors: [
131-
'Unexpected consecutive same character sets. Use "{2}" instead.',
131+
'Unexpected consecutive same character class escapes. Use "{2}" instead.',
132132
],
133133
},
134134
{
@@ -156,14 +156,14 @@ tester.run("prefer-quantifier", rule as any, {
156156
code: `/a.{1,3}?.{2,4}?c/`,
157157
output: `/a.{3,7}?c/`,
158158
errors: [
159-
'Unexpected consecutive same character sets. Use "{3,7}?" instead.',
159+
'Unexpected consecutive same any characters. Use "{3,7}?" instead.',
160160
],
161161
},
162162
{
163163
code: `/a.{1,3}.{2,4}c/`,
164164
output: `/a.{3,7}c/`,
165165
errors: [
166-
'Unexpected consecutive same character sets. Use "{3,7}" instead.',
166+
'Unexpected consecutive same any characters. Use "{3,7}" instead.',
167167
],
168168
},
169169
],

‎tests/lib/rules/prefer-w.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tester.run("prefer-w", rule as any, {
1717
errors: [
1818
{
1919
message:
20-
'Unexpected character set "[0-9a-zA-Z_]". Use "\\w" instead.',
20+
'Unexpected character class "[0-9a-zA-Z_]". Use "\\w" instead.',
2121
column: 2,
2222
endColumn: 14,
2323
},
@@ -29,7 +29,7 @@ tester.run("prefer-w", rule as any, {
2929
errors: [
3030
{
3131
message:
32-
'Unexpected character set "[0-9a-zA-Z_]". Use "\\w" instead.',
32+
'Unexpected character class ranges "[0-9a-zA-Z_]". Use "\\w" instead.',
3333
column: 2,
3434
endColumn: 15,
3535
},
@@ -39,21 +39,21 @@ tester.run("prefer-w", rule as any, {
3939
code: "/[0-9a-z_]/i",
4040
output: "/\\w/i",
4141
errors: [
42-
'Unexpected character set "[0-9a-z_]". Use "\\w" instead.',
42+
'Unexpected character class "[0-9a-z_]". Use "\\w" instead.',
4343
],
4444
},
4545
{
4646
code: "/[^0-9a-zA-Z_]/",
4747
output: "/\\W/",
4848
errors: [
49-
'Unexpected character set "[^0-9a-zA-Z_]". Use "\\W" instead.',
49+
'Unexpected character class "[^0-9a-zA-Z_]". Use "\\W" instead.',
5050
],
5151
},
5252
{
5353
code: "/[^0-9A-Z_]/i",
5454
output: "/\\W/i",
5555
errors: [
56-
'Unexpected character set "[^0-9A-Z_]". Use "\\W" instead.',
56+
'Unexpected character class "[^0-9A-Z_]". Use "\\W" instead.',
5757
],
5858
},
5959
{
@@ -66,7 +66,7 @@ tester.run("prefer-w", rule as any, {
6666
new RegExp(s, 'i')
6767
`,
6868
errors: [
69-
'Unexpected character set "[0-9A-Z_]". Use "\\w" instead.',
69+
'Unexpected character class "[0-9A-Z_]". Use "\\w" instead.',
7070
],
7171
},
7272
{
@@ -76,7 +76,7 @@ tester.run("prefer-w", rule as any, {
7676
`,
7777
output: null,
7878
errors: [
79-
'Unexpected character set "[0-9A-Z_]". Use "\\w" instead.',
79+
'Unexpected character class "[0-9A-Z_]". Use "\\w" instead.',
8080
],
8181
},
8282
{
@@ -89,7 +89,7 @@ tester.run("prefer-w", rule as any, {
8989
new RegExp(s, 'i')
9090
`,
9191
errors: [
92-
'Unexpected character set "[0-9A-Z_]". Use "\\w" instead.',
92+
'Unexpected character class ranges "[0-9A-Z_]". Use "\\w" instead.',
9393
],
9494
},
9595
{
@@ -99,7 +99,7 @@ tester.run("prefer-w", rule as any, {
9999
`,
100100
output: null,
101101
errors: [
102-
'Unexpected character set "[0-9A-Z_]". Use "\\w" instead.',
102+
'Unexpected character class ranges "[0-9A-Z_]". Use "\\w" instead.',
103103
],
104104
},
105105
],

0 commit comments

Comments
 (0)