Skip to content

Commit 770942f

Browse files
JantherJanther
committed
Antlr4 - Hierarchical indentation and grouping of binary expressions.
1 parent 223d37d commit 770942f

16 files changed

+169
-130
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { binaryOperationPrinter } from './printers/binary-operation-printer.js';
2+
import { bit } from './bit.js';
3+
import { shift } from './shift.js';
4+
import { inequality } from './inequality.js';
5+
import { equality } from './equality.js';
6+
import { logical } from './logical.js';
7+
8+
export const addition = {
9+
match: (op) => ['+', '-'].includes(op),
10+
print: binaryOperationPrinter([shift, bit, inequality, equality, logical])
11+
};

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

Lines changed: 0 additions & 51 deletions
This file was deleted.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
import { arithmetic } from './arithmetic.js';
1+
import { binaryOperationPrinter } from './printers/binary-operation-printer.js';
2+
import { inequality } from './inequality.js';
3+
import { equality } from './equality.js';
4+
import { logical } from './logical.js';
25

36
export const bit = {
47
match: (op) => ['&', '|', '^'].includes(op),
5-
print: arithmetic.print
8+
print: binaryOperationPrinter([inequality, equality, logical])
69
};

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

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { binaryOperationPrinter } from './printers/binary-operation-printer.js';
2+
import { logical } from './logical.js';
3+
4+
export const equality = {
5+
match: (op) => ['==', '!='].includes(op),
6+
print: binaryOperationPrinter([logical])
7+
};

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

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
import { doc } from 'prettier';
2+
import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
3+
import { createIndentIfNecessaryBuilder } from './printers/create-indent-if-necessary-builder.js';
4+
import { multiplication } from './multiplication.js';
5+
import { addition } from './addition.js';
6+
import { shift } from './shift.js';
7+
import { bit } from './bit.js';
8+
import { inequality } from './inequality.js';
9+
import { equality } from './equality.js';
10+
import { logical } from './logical.js';
211

3-
const { group, indent, line } = doc.builders;
12+
const { group } = doc.builders;
413

514
export const exponentiation = {
615
match: (op) => op === '**',
7-
print: (node, path, print) => {
8-
const right = [' ', node.operator, line, path.call(print, 'right')];
9-
// If it's a single binary operation, avoid having a small right
10-
// operand like - 1 on its own line
11-
const shouldGroup =
12-
node.left.type !== 'BinaryOperation' &&
13-
path.getParentNode().type !== 'BinaryOperation';
14-
return group([
15-
path.call(print, 'left'),
16-
indent(shouldGroup ? group(right) : right)
17-
]);
18-
}
16+
print: createBinaryOperationPrinter(
17+
() => (document) => group(document), // always group
18+
createIndentIfNecessaryBuilder([
19+
multiplication,
20+
addition,
21+
shift,
22+
bit,
23+
inequality,
24+
equality,
25+
logical
26+
])
27+
)
1928
};

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
export * from './arithmetic.js';
1+
export * from './addition.js';
22
export * from './assignment.js';
33
export * from './bit.js';
4-
export * from './comparison.js';
4+
export * from './equality.js';
55
export * from './exponentiation.js';
6+
export * from './inequality.js';
67
export * from './logical.js';
8+
export * from './multiplication.js';
79
export * from './shift.js';

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { binaryOperationPrinter } from './printers/binary-operation-printer.js';
2+
import { logical } from './logical.js';
3+
import { equality } from './equality.js';
4+
5+
export const inequality = {
6+
match: (op) => ['<', '>', '<=', '>='].includes(op),
7+
print: binaryOperationPrinter([logical, equality])
8+
};

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

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
import { doc } from 'prettier';
2+
import { createBinaryOperationPrinter } from './printers/create-binary-operation-printer.js';
3+
import { createGroupIfNecessaryBuilder } from './printers/create-group-if-necessary-builder.js';
4+
import { notIndentParentTypes } from './printers/create-indent-if-necessary-builder.js';
5+
import { shouldGroupOrIndent } from './utils/should-group-or-indent.js';
26

3-
const { group, line, indent } = doc.builders;
4-
5-
const groupIfNecessaryBuilder = (path) => (document) =>
6-
path.getParentNode().type === 'BinaryOperation' ? document : group(document);
7+
const { indent } = doc.builders;
78

89
const indentIfNecessaryBuilder = (path, options) => (document) => {
910
let node = path.getNode();
1011
for (let i = 0; ; i += 1) {
1112
const parentNode = path.getParentNode(i);
12-
if (parentNode.type === 'ReturnStatement') return document;
13-
if (parentNode.type === 'IfStatement') return document;
14-
if (parentNode.type === 'WhileStatement') return document;
13+
if (notIndentParentTypes.includes(parentNode.type)) return document;
1514
if (
1615
options.experimentalTernaries &&
1716
parentNode.type === 'Conditional' &&
1817
parentNode.condition === node
1918
)
2019
return document;
21-
if (parentNode.type !== 'BinaryOperation') return indent(document);
20+
if (shouldGroupOrIndent(parentNode, [])) return indent(document);
2221
if (node === parentNode.right) return document;
2322
node = parentNode;
2423
}
2524
};
2625

2726
export const logical = {
2827
match: (op) => ['&&', '||'].includes(op),
29-
print: (node, path, print, options) => {
30-
const groupIfNecessary = groupIfNecessaryBuilder(path);
31-
const indentIfNecessary = indentIfNecessaryBuilder(path, options);
32-
33-
const right = [node.operator, line, path.call(print, 'right')];
34-
// If it's a single binary operation, avoid having a small right
35-
// operand like - 1 on its own line
36-
const shouldGroup =
37-
node.left.type !== 'BinaryOperation' &&
38-
path.getParentNode().type !== 'BinaryOperation';
39-
return groupIfNecessary([
40-
path.call(print, 'left'),
41-
' ',
42-
indentIfNecessary(shouldGroup ? group(right) : right)
43-
]);
44-
}
28+
print: createBinaryOperationPrinter(
29+
createGroupIfNecessaryBuilder([]),
30+
indentIfNecessaryBuilder
31+
)
4532
};

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { binaryOperationPrinter } from './printers/binary-operation-printer.js';
2+
import { addition } from './addition.js';
3+
import { bit } from './bit.js';
4+
import { equality } from './equality.js';
5+
import { inequality } from './inequality.js';
6+
import { shift } from './shift.js';
7+
import { logical } from './logical.js';
8+
9+
export const multiplication = {
10+
match: (op) => ['*', '/', '%'].includes(op),
11+
print: binaryOperationPrinter([
12+
addition,
13+
shift,
14+
bit,
15+
inequality,
16+
equality,
17+
logical
18+
])
19+
};

0 commit comments

Comments
 (0)