Skip to content

Commit 0e96950

Browse files
committed
moving the always grouped behaviour to it's own function
1 parent 95236e2 commit 0e96950

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

src/binary-operator-printers/equality.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
import { doc } from 'prettier';
2-
import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
1+
import { createGroupedBinaryOperationPrinter } from './printers/create-grouped-binary-operation-printer.js';
32
import { createComparisonIndentIfNecessaryBuilder } from './printers/create-indent-if-necessary-builder.js';
43
import { logical } from './logical.js';
54

6-
const { group } = doc.builders;
7-
8-
const equalityPrinter = createBinaryOperationPrinter(
9-
() => (document) => group(document), // always group
5+
const equalityPrinter = createGroupedBinaryOperationPrinter(
106
createComparisonIndentIfNecessaryBuilder([logical])
117
);
128

src/binary-operator-printers/exponentiation.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
import { doc } from 'prettier';
2-
import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
1+
import { createGroupedBinaryOperationPrinter } from './printers/create-grouped-binary-operation-printer.js';
32
import { createArithmeticIndentIfNecessaryBuilder } from './printers/create-indent-if-necessary-builder.js';
43
import { addition } from './addition.js';
54
import { equality } from './equality.js';
65
import { inequality } from './inequality.js';
76
import { multiplication } from './multiplication.js';
87

9-
const { group } = doc.builders;
10-
11-
const exponentiationPrinter = createBinaryOperationPrinter(
12-
() => (document) => group(document), // always group
8+
const exponentiationPrinter = createGroupedBinaryOperationPrinter(
139
createArithmeticIndentIfNecessaryBuilder([
1410
addition,
1511
equality,

src/binary-operator-printers/inequality.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
import { doc } from 'prettier';
2-
import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
1+
import { createGroupedBinaryOperationPrinter } from './printers/create-grouped-binary-operation-printer.js';
32
import { createComparisonIndentIfNecessaryBuilder } from './printers/create-indent-if-necessary-builder.js';
43
import { logical } from './logical.js';
54
import { equality } from './equality.js';
65

7-
const { group } = doc.builders;
8-
9-
const inequalityPrinter = createBinaryOperationPrinter(
10-
() => (document) => group(document), // always group
6+
const inequalityPrinter = createGroupedBinaryOperationPrinter(
117
createComparisonIndentIfNecessaryBuilder([logical, equality])
128
);
139

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { doc } from 'prettier';
2+
import { createBinaryOperationPrinter } from './create-binary-operation-printer.js';
3+
4+
const { group } = doc.builders;
5+
6+
export const createGroupedBinaryOperationPrinter = (indentIfNecessaryBuilder) =>
7+
createBinaryOperationPrinter(
8+
() => (document) => group(document), // always group
9+
indentIfNecessaryBuilder
10+
);

0 commit comments

Comments
 (0)