Skip to content

Commit a863ce1

Browse files
authored
fix(retif): correct parentheses for bin in retif (#1257)
1 parent 7719096 commit a863ce1

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

src/needs-parens.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function needsParens(path) {
6464
case "bin": {
6565
switch (parent.kind) {
6666
case "assign":
67+
case "retif":
6768
return ["and", "xor", "or"].includes(node.type);
6869
case "silent":
6970
case "cast":

tests/parens/__snapshots__/jsfmt.spec.js.snap

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ $var = ($foo ?? $baz) || $baz;
733733
$var = $foo ?? $baz || $baz;
734734
$var = ($foo && $baz) ?? $baz;
735735
$var = $foo && ($baz ?? $baz);
736+
736737
=====================================output=====================================
737738
<?php
738739
@@ -2885,6 +2886,16 @@ $var = ($var ?: ($var ?: $var)) ?: 'string';
28852886
$var = ($var ?: (($var ?: $var) ?: 'string'));
28862887
$var = ($var ?: ($var ?: ($var ?: 'string')));
28872888
2889+
$var = ($foo and $bar) ? true : false;
2890+
$var = ($foo or $bar) ? true : false;
2891+
$var = ($foo xor $bar) ? true : false;
2892+
$var = ($foo = "bar") ? true : false;
2893+
2894+
$var = ($foo && $bar) ? true : false;
2895+
$var = ($foo || $bar) ? true : false;
2896+
$var = (!$foo) ? true : false;
2897+
$var = (new $foo) ? true : false;
2898+
28882899
=====================================output=====================================
28892900
<?php
28902901
@@ -2951,6 +2962,16 @@ $var = $var ?: ($var ?: $var) ?: 'string';
29512962
$var = $var ?: ($var ?: $var ?: 'string');
29522963
$var = $var ?: ($var ?: ($var ?: 'string'));
29532964
2965+
$var = ($foo and $bar) ? true : false;
2966+
$var = ($foo or $bar) ? true : false;
2967+
$var = ($foo xor $bar) ? true : false;
2968+
$var = ($foo = "bar") ? true : false;
2969+
2970+
$var = $foo && $bar ? true : false;
2971+
$var = $foo || $bar ? true : false;
2972+
$var = !$foo ? true : false;
2973+
$var = new $foo() ? true : false;
2974+
29542975
================================================================================
29552976
`;
29562977

tests/parens/bin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,4 +358,4 @@
358358
$var = ($foo ?? $baz) || $baz;
359359
$var = $foo ?? $baz || $baz;
360360
$var = ($foo && $baz) ?? $baz;
361-
$var = $foo && ($baz ?? $baz);
361+
$var = $foo && ($baz ?? $baz);

tests/parens/retif.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,13 @@
5050
$var = ($var ?: ($var ?: $var)) ?: 'string';
5151
$var = ($var ?: (($var ?: $var) ?: 'string'));
5252
$var = ($var ?: ($var ?: ($var ?: 'string')));
53+
54+
$var = ($foo and $bar) ? true : false;
55+
$var = ($foo or $bar) ? true : false;
56+
$var = ($foo xor $bar) ? true : false;
57+
$var = ($foo = "bar") ? true : false;
58+
59+
$var = ($foo && $bar) ? true : false;
60+
$var = ($foo || $bar) ? true : false;
61+
$var = (!$foo) ? true : false;
62+
$var = (new $foo) ? true : false;

0 commit comments

Comments
 (0)