Skip to content

Commit e50cb69

Browse files
committed
fix: @putout/plugin-remove-useless-escape: report
1 parent a503a5d commit e50cb69

4 files changed

Lines changed: 34 additions & 12 deletions

File tree

packages/plugin-react-hook-form/lib/v6-convert-as-to-render/index.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,18 @@ export const match = () => ({
2929
},
3030
});
3131

32-
export const replace = () => ({
33-
[`
32+
const element = `
3433
<Controller
35-
as={__a}
36-
valueName="__b"
37-
onChangeName="__c"
38-
control={__d}
39-
name="__e"
34+
as={__a}
35+
valueName="__b"
36+
onChangeName="__c"
37+
control={__d}
38+
name="__e"
4039
/>
41-
`]: ({__a, __b, __c}) => `
40+
`;
41+
42+
export const replace = () => ({
43+
[element]: ({__a, __b, __c}) => `
4244
<Controller
4345
render={({field}) => {
4446
const {value, onChange} = field;

packages/plugin-remove-useless-escape/lib/remove-useless-escape.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import emojiRegex from 'emoji-regex';
22

3-
export const report = () => 'Unnecessary escape character';
3+
export const report = () => 'Avoid useless escape';
44

55
export const fix = (path) => {
66
if (path.isStringLiteral()) {
@@ -32,7 +32,7 @@ export const traverse = ({push}) => ({
3232
if (raw.includes('${'))
3333
return;
3434

35-
if (raw.includes('{('))
35+
if (raw.includes('$('))
3636
return push(path);
3737

3838
if (isEscaped(raw))
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
export const replace = () => ({
2+
[element]: ({__a, __b, __c}) => `
3+
<Controller
4+
render={({field}) => {
5+
const {value, onChange} = field;
6+
return (
7+
<${__a.name} ${__c.value}={onChange} onBlur={onBlur} ${__b.value}={value} />
8+
)
9+
}}
10+
control={__d}
11+
name="__e"
12+
/>
13+
`,
14+
});
15+

packages/plugin-remove-useless-escape/test/remove-useless-escape.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ const test = createTest(import.meta.url, {
1111
});
1212

1313
test('plugin-remove-useless-escape: report: string', (t) => {
14-
t.report('string', 'Unnecessary escape character');
14+
t.report('string', 'Avoid useless escape');
1515
t.end();
1616
});
1717

1818
test('plugin-remove-useless-escape: report: a: ^', (t) => {
19-
t.report('a', 'Unnecessary escape character');
19+
t.report('a', 'Avoid useless escape');
2020
t.end();
2121
});
2222

@@ -115,6 +115,11 @@ test('plugin-remove-useless-escape: transform: z', (t) => {
115115
t.end();
116116
});
117117

118+
test('plugin-remove-useless-escape: no report: multiline', (t) => {
119+
t.noReport('multiline');
120+
t.end();
121+
});
122+
118123
test('plugin-remove-useless-escape: transform: single-quote-inside-template', (t) => {
119124
t.transform('single-quote-inside-template');
120125
t.end();

0 commit comments

Comments
 (0)