Skip to content

Commit 1ccc8ec

Browse files
JantherJanther
committed
indenting comparison over logical operators
1 parent 4c1da4e commit 1ccc8ec

4 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎src/binary-operator-printers/comparison.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { doc } from 'prettier';
2+
import { logical } from './logical.js';
23

34
const { group, indent, line } = doc.builders;
45

@@ -11,6 +12,7 @@ const indentIfNecessaryBuilder = (path) => (document) => {
1112
if (parentNode.type === 'ForStatement') return document;
1213
if (parentNode.type === 'WhileStatement') return document;
1314
if (parentNode.type !== 'BinaryOperation') return indent(document);
15+
if (logical.match(parentNode.operator)) return indent(document);
1416
if (node === parentNode.right) return document;
1517
node = parentNode;
1618
}

‎tests/format/BinaryOperationHierarchy/__snapshots__/jsfmt.spec.js.snap‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2825,11 +2825,11 @@ contract Indent {
28252825
resultBoolean =
28262826
veryVeryVeryExtremelyExtremelyLongBooleanA ||
28272827
veryVeryVeryExtremelyExtremelyLongBooleanB ==
2828-
veryVeryVeryExtremelyExtremelyLongBooleanC;
2828+
veryVeryVeryExtremelyExtremelyLongBooleanC;
28292829
resultBoolean =
28302830
veryVeryVeryExtremelyExtremelyLongBooleanA ||
28312831
veryVeryVeryExtremelyExtremelyLongBooleanB !=
2832-
veryVeryVeryExtremelyExtremelyLongBooleanC;
2832+
veryVeryVeryExtremelyExtremelyLongBooleanC;
28332833
resultBoolean =
28342834
(veryVeryVeryExtremelyExtremelyLongBooleanA &&
28352835
veryVeryVeryExtremelyExtremelyLongBooleanB) ||
@@ -2841,26 +2841,26 @@ contract Indent {
28412841
resultBoolean =
28422842
veryVeryVeryExtremelyExtremelyLongBooleanA &&
28432843
veryVeryVeryExtremelyExtremelyLongBooleanB ==
2844-
veryVeryVeryExtremelyExtremelyLongBooleanC;
2844+
veryVeryVeryExtremelyExtremelyLongBooleanC;
28452845
resultBoolean =
28462846
veryVeryVeryExtremelyExtremelyLongBooleanA &&
28472847
veryVeryVeryExtremelyExtremelyLongBooleanB !=
2848-
veryVeryVeryExtremelyExtremelyLongBooleanC;
2848+
veryVeryVeryExtremelyExtremelyLongBooleanC;
28492849
resultBoolean =
28502850
veryVeryVeryExtremelyExtremelyLongBooleanA ==
2851-
veryVeryVeryExtremelyExtremelyLongBooleanB ||
2851+
veryVeryVeryExtremelyExtremelyLongBooleanB ||
28522852
veryVeryVeryExtremelyExtremelyLongBooleanC;
28532853
resultBoolean =
28542854
veryVeryVeryExtremelyExtremelyLongBooleanA ==
2855-
veryVeryVeryExtremelyExtremelyLongBooleanB &&
2855+
veryVeryVeryExtremelyExtremelyLongBooleanB &&
28562856
veryVeryVeryExtremelyExtremelyLongBooleanC;
28572857
resultBoolean =
28582858
veryVeryVeryExtremelyExtremelyLongBooleanA !=
2859-
veryVeryVeryExtremelyExtremelyLongBooleanB ||
2859+
veryVeryVeryExtremelyExtremelyLongBooleanB ||
28602860
veryVeryVeryExtremelyExtremelyLongBooleanC;
28612861
resultBoolean =
28622862
veryVeryVeryExtremelyExtremelyLongBooleanA !=
2863-
veryVeryVeryExtremelyExtremelyLongBooleanB &&
2863+
veryVeryVeryExtremelyExtremelyLongBooleanB &&
28642864
veryVeryVeryExtremelyExtremelyLongBooleanC;
28652865
}
28662866
}

‎tests/format/BinaryOperators/__snapshots__/jsfmt.spec.js.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ contract ComparisonOperators {
504504
veryVeryVeryVeryVeryLongFunctionCalledA(
505505
veryVeryVeryVeryVeryLongVariableCalledB
506506
) >
507-
d;
507+
d;
508508
a =
509509
veryVeryVeryVeryVeryLongFunctionCalledA(
510510
veryVeryVeryVeryVeryLongVariableCalledB

‎tests/format/ExperimentalTernaries/__snapshots__/jsfmt.spec.js.snap‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ contract Conditional {
409409
(
410410
bifornCringerMoshedPerplexSawder == 2 / askTrovenaBeenaDependsRowans &&
411411
glimseGlyphsHazardNoopsTieTie >=
412-
averredBathersBoxroomBuggyNurl().anodyneCondosMalateOverateRetinol()
412+
averredBathersBoxroomBuggyNurl().anodyneCondosMalateOverateRetinol()
413413
) ?
414414
"foo"
415415
: "bar";
@@ -420,7 +420,7 @@ contract Conditional {
420420
(
421421
bifornCringerMoshedPerplexSawder == 2 / askTrovenaBeenaDependsRowans &&
422422
glimseGlyphsHazardNoopsTieTie >=
423-
averredBathersBoxroomBuggyNurl().anodyneCondosMalateOverateRetinol()
423+
averredBathersBoxroomBuggyNurl().anodyneCondosMalateOverateRetinol()
424424
) ?
425425
"foo"
426426
: anotherCondition ? "bar"
@@ -920,8 +920,8 @@ contract Conditional {
920920
bifornCringerMoshedPerplexSawder ==
921921
2 / askTrovenaBeenaDependsRowans &&
922922
glimseGlyphsHazardNoopsTieTie >=
923-
averredBathersBoxroomBuggyNurl()
924-
.anodyneCondosMalateOverateRetinol()
923+
averredBathersBoxroomBuggyNurl()
924+
.anodyneCondosMalateOverateRetinol()
925925
) ?
926926
"foo"
927927
: "bar";
@@ -933,8 +933,8 @@ contract Conditional {
933933
bifornCringerMoshedPerplexSawder ==
934934
2 / askTrovenaBeenaDependsRowans &&
935935
glimseGlyphsHazardNoopsTieTie >=
936-
averredBathersBoxroomBuggyNurl()
937-
.anodyneCondosMalateOverateRetinol()
936+
averredBathersBoxroomBuggyNurl()
937+
.anodyneCondosMalateOverateRetinol()
938938
) ?
939939
"foo"
940940
: anotherCondition ? "bar"
@@ -1433,8 +1433,8 @@ contract Conditional {
14331433
bifornCringerMoshedPerplexSawder ==
14341434
2 / askTrovenaBeenaDependsRowans &&
14351435
glimseGlyphsHazardNoopsTieTie >=
1436-
averredBathersBoxroomBuggyNurl()
1437-
.anodyneCondosMalateOverateRetinol()
1436+
averredBathersBoxroomBuggyNurl()
1437+
.anodyneCondosMalateOverateRetinol()
14381438
) ?
14391439
"foo"
14401440
: "bar";
@@ -1446,8 +1446,8 @@ contract Conditional {
14461446
bifornCringerMoshedPerplexSawder ==
14471447
2 / askTrovenaBeenaDependsRowans &&
14481448
glimseGlyphsHazardNoopsTieTie >=
1449-
averredBathersBoxroomBuggyNurl()
1450-
.anodyneCondosMalateOverateRetinol()
1449+
averredBathersBoxroomBuggyNurl()
1450+
.anodyneCondosMalateOverateRetinol()
14511451
) ?
14521452
"foo"
14531453
: anotherCondition ? "bar"
@@ -1945,8 +1945,8 @@ contract Conditional {
19451945
string storage longConditional = (bifornCringerMoshedPerplexSawder ==
19461946
2 / askTrovenaBeenaDependsRowans &&
19471947
glimseGlyphsHazardNoopsTieTie >=
1948-
averredBathersBoxroomBuggyNurl()
1949-
.anodyneCondosMalateOverateRetinol())
1948+
averredBathersBoxroomBuggyNurl()
1949+
.anodyneCondosMalateOverateRetinol())
19501950
? "foo"
19511951
: "bar";
19521952
@@ -1956,8 +1956,8 @@ contract Conditional {
19561956
storage longConditionalChained = (bifornCringerMoshedPerplexSawder ==
19571957
2 / askTrovenaBeenaDependsRowans &&
19581958
glimseGlyphsHazardNoopsTieTie >=
1959-
averredBathersBoxroomBuggyNurl()
1960-
.anodyneCondosMalateOverateRetinol())
1959+
averredBathersBoxroomBuggyNurl()
1960+
.anodyneCondosMalateOverateRetinol())
19611961
? "foo"
19621962
: anotherCondition
19631963
? "bar"

0 commit comments

Comments
 (0)