From aace7269d018735c4bfc8a12b2c29ed42e06ab55 Mon Sep 17 00:00:00 2001 From: fisker Date: Mon, 21 Nov 2022 01:45:45 +0800 Subject: [PATCH] `prefer-string-replace-all`: Minor tweak to the message --- rules/prefer-string-replace-all.js | 4 ++-- test/prefer-string-replace-all.mjs | 2 +- .../prefer-string-replace-all.mjs.md | 12 ++++++------ .../prefer-string-replace-all.mjs.snap | Bin 1837 -> 1840 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rules/prefer-string-replace-all.js b/rules/prefer-string-replace-all.js index 5e80f9bc35..b755fc80a9 100644 --- a/rules/prefer-string-replace-all.js +++ b/rules/prefer-string-replace-all.js @@ -9,7 +9,7 @@ const MESSAGE_ID_USE_REPLACE_ALL = 'method'; const MESSAGE_ID_USE_STRING = 'pattern'; const messages = { [MESSAGE_ID_USE_REPLACE_ALL]: 'Prefer `String#replaceAll()` over `String#replace()`.', - [MESSAGE_ID_USE_STRING]: 'This pattern can be replaced with a string {{replacement}}.', + [MESSAGE_ID_USE_STRING]: 'This pattern can be replaced with {{replacement}}.', }; const selector = methodCallSelector({ @@ -97,7 +97,7 @@ const create = context => ({ messageId: MESSAGE_ID_USE_STRING, data: { // Show `This pattern can be replaced with a string literal.` for long strings - replacement: patternReplacement.length < 20 ? patternReplacement : 'literal', + replacement: patternReplacement.length < 20 ? patternReplacement : 'a string literal', }, /** @param {import('eslint').Rule.RuleFixer} fixer */ fix: fixer => fixer.replaceText(pattern, patternReplacement), diff --git a/test/prefer-string-replace-all.mjs b/test/prefer-string-replace-all.mjs index 1ac58c935d..d8226d698d 100644 --- a/test/prefer-string-replace-all.mjs +++ b/test/prefer-string-replace-all.mjs @@ -102,6 +102,6 @@ test.snapshot({ 'foo.replaceAll(/a]/g, _)', 'foo.replaceAll(/\\r\\n\\u{1f600}/gu, _)', - `foo.replaceAll(/a${' very'.repeat(30)} string/g, _)`, + `foo.replaceAll(/a${' very'.repeat(30)} long string/g, _)`, ], }); diff --git a/test/snapshots/prefer-string-replace-all.mjs.md b/test/snapshots/prefer-string-replace-all.mjs.md index 1bc94d70d9..56aa976f28 100644 --- a/test/snapshots/prefer-string-replace-all.mjs.md +++ b/test/snapshots/prefer-string-replace-all.mjs.md @@ -579,7 +579,7 @@ Generated by [AVA](https://avajs.dev). `␊ > 1 | foo.replaceAll(/a]/g, _)␊ - | ^^^^^ This pattern can be replaced with a string 'a]'.␊ + | ^^^^^ This pattern can be replaced with 'a]'.␊ ` ## Invalid #36 @@ -595,21 +595,21 @@ Generated by [AVA](https://avajs.dev). `␊ > 1 | foo.replaceAll(/\\r\\n\\u{1f600}/gu, _)␊ - | ^^^^^^^^^^^^^^^^^ This pattern can be replaced with a string '\\r\\n😀'.␊ + | ^^^^^^^^^^^^^^^^^ This pattern can be replaced with '\\r\\n😀'.␊ ` ## Invalid #37 - 1 | foo.replaceAll(/a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very string/g, _) + 1 | foo.replaceAll(/a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long string/g, _) > Output `␊ - 1 | foo.replaceAll('a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very string', _)␊ + 1 | foo.replaceAll('a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long string', _)␊ ` > Error 1/1 `␊ - > 1 | foo.replaceAll(/a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very string/g, _)␊ - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This pattern can be replaced with a string literal.␊ + > 1 | foo.replaceAll(/a very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long string/g, _)␊ + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This pattern can be replaced with a string literal.␊ ` diff --git a/test/snapshots/prefer-string-replace-all.mjs.snap b/test/snapshots/prefer-string-replace-all.mjs.snap index 1ba0cdf437e4f456ab08735b2ac49e18452cc802..aa0b930b2391f34e4ec90aa9ff7bcbe172625a11 100644 GIT binary patch literal 1840 zcmV-02haFHRzVpokR~9K1BBWtA_^$utyQZD5@HB}BrrJ;O2lKFdI7eI7sdO& zP;`p5idt>44vq&F9Hpi8wzZ;SwPR82+n1*V*o9zS%A5IicE0z&-S55sfB(O4AKMXx z7r{BTa9?ml_~+y``vuYa?gs&aYGRC?5Dwv)S)UbzbgljuM^Z2I{I`85rjwNYPg&&Zo|xH=Goq<2967l##R^0a?CYdVaC zZ=u*wjISvR;Tn&as@xmF-6mx3<1dGEq1ZbZ)7uinh*AA}yBLZcdi|4=>14Rf1&CdY z@rts@@!81n-{O+~>%2wU^Fwa{#13$@U<<@(H|;jC@~^+k0|Z073zJI#VlQEYIYEmH zZqtVRcx!RuvQoje-qq!;=IWBtQ|nCsDlMNAm)!raXP(J)uCLpy!*IC z5$*u7Wf-G7!Wg-^so%DObuTt=7+%%x0lTwb|v?C7(i^V zP8O_ySQ8}E-P4_s6#70KTD96u1`vA!BhVQ}!NBOs<%^7I(HjSM%?|Sz4iGyF;~K=4 zp2dQUy{YYY#LwU1UV3plKrFYj1@j=bB^aGMO)Z*PmUD@3T$c^E0>$pf=+}iHc8PZ{ za~-h#&_M_LitNy00w7k2@c?3X2ftTF<<`l2z*gV!L;>APZvm(t(B3+z<5m z{`l3YIxPX`La~JyVi$t=Hr=$dG^29Y?Sp$(uj;Yy6+o;KqXOb&%HF;XcRTiZnBXg@ zeioMl5Zm6>f_V_9UJs58*;*1hu#0`oy0xXZ0Aj~=v!Ih3L7bj_epK;E?UDX9Q=HQu zn^ytEhF}yx+*fIjIaNhf6qy$!=PrJl1rU21BdP~M{NeYFW9Y$*S7Wmb6FDPe+5^O9 zVYG24h-arg^NTiAdKGmyc0IRbZy7*r0LC7O8m|{wc^AfoJ{{05SQ}qb2@rb?W4s4^ z4$&6nHjX{fnd8YNNik_AV-pko^vWcST%jDM(FpiFDWC64^5NB+TW3HVH@N-)fsn@+ zs@_Fjj`_*|X$RuiY3VldLqE@Ta z86o2%gdGyt;bbM>%0dDy1kl8vGI6r%@V5*NKs;a0CxybdeF3mzAnNdicY)|GMy`kV zLDYTS6#1NX|JjgpYK>dLcA=LjG_ksleHkRuS4WPP*4NBc z@jWUXjg=}Abq3?x1UrP(DQA-tm8!6mBmob~;`x$170>(Q`ZK}7#ALhyEj^rddjnh)u1GtEscKl1O!I>SH+m zPzBbcrpqt1#~*9!mQ2)qsvh&;Yk9V)L?szpw`e($PHje6wlZc#WN)SeZ!@;Hgw2p- z5=hbrjAy7M5|+!zd#TBkK=%C1xULunVzczd2|`fNCZ-LuyROiA997HByLH1vN0Lz=Q4(6V_d zO-$o-`lEK5n8oD;rwAsABpjdG`YxJ8or*M|S<(FX%jYot^l1gso0v|Mf2CS|v*EXy z98Z?isG*TuWApd0N!^U9X=U9CzCSdLr5{#5LKuIr2vxMF3#Kn6Ru30UKF5W`MxR?- ex9G8#`sZ(R1y_ubD&pUBKK~a6c&ZjaAOHX;dvx&t literal 1837 zcmV+|2h#XKRzV;)O(|wyQ1b7d@`jDOZGH<^9H}Bhj|NZ~B`>-xiGG=K9T#T$cthJC~pufs%Zo7krdCV9daD*xZSg-rt|jA6l41WkJmDClHwe;5Nu(@8|m!CrUJbT19mW zKyP8#nFOa83wph6*rVKQ-hHQK7mG5{Tp0E_L6jK)<0lLqWF1#-YWH_ex<%YMONiMV zf*$6`BFAa7zaPozX)1iKLCpFPe2p-vzor1LdGh>X)3%4(t1!<}zJ!=;o2VvwdyHLCnSz+(Xzp zuw0y0l+<;5#G>ss7b`!8m>t;DfGmW9NS#%Wpt3ntIcG(>joD}`Fzj&x&t3rRbS+%f zXV|uVdrVELv&WVLh}i^!mk5Ou124J6!+W(G>`R8Yt=$AM>)6|Xe1yW4!;b~q>>m8X z(Mv&E4M1~Y*h+$N)&P8ys^4)jt!C%VJzuR`JD~U_#B2h=LxkgrMMF$)bsu~`(pg;l zbY2d`?4UjdWFeF$R7@y8t~ofgZkAQ*!<4lUvnL2f^hN8V(j2jP6jEK5vN%3>`Qr?T zSrx%GguB7|TCX)gma;-(7%!n#7tt|lgRclrDMz3)UrK01TcOl-T(OY3UXwXSJQHp4dMyb^y z#)(E9Zm7e;NWPJU8?q216L-eM!l=XDFw_I{BDsj7>H0no)G-`)IHM;|{1hgSMbBQ$ zb7POdb1i7|Zmf+(7~?F9|LLk%O^=q-s@I;Mz=0z~q_I-%!_6BOqBxn;#3d_1^C)4) z(99UAKG`+gQzDs9tMqtiL&O-hkfx2AIZqu&#mIF!WvrG`$hB0Mk|O^-mr79U=23Dg z4m*cx(AGGP1Qf?yQqUxj2b#=W#TM(*6eiZOF(08W5VA|8NiKmDi@*quO5(eXk%+5Dcp-sMX2`eaYTL7@5iM{=Yo z;{olPr;=S+7M=a5o$UH{K0x&9Hl!&d>kg3cS+0N@)|=0)503yYp%faQ)bV}{w^=Ng zsyhT+_h=nJHTO(jdB@k0TU+iQqtwVq9@W|#6XNOPELB9j;ROCKSgFe$Lm&VE_1TDg