Skip to content

Commit d3d67ba

Browse files
committed
Prettier tweaked at some point Exponentiation's indentation making it closer to a normal binary operation indentation instead of always indenting.
1 parent 07f471c commit d3d67ba

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/binary-operator-printers/arithmetic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const groupIfNecessaryBuilder = (path) => (document) => {
1414
return group(document);
1515
};
1616

17-
const indentIfNecessaryBuilder = (path) => (document) => {
17+
export const indentIfNecessaryBuilder = (path) => (document) => {
1818
let node = path.getNode();
1919
for (let i = 0; ; i += 1) {
2020
const parentNode = path.getParentNode(i);
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { doc } from 'prettier';
2+
import { indentIfNecessaryBuilder } from './arithmetic.js';
23

3-
const { group, indent, line } = doc.builders;
4+
const { group, line } = doc.builders;
45

56
export const exponentiation = {
67
match: (op) => op === '**',
78
print: (node, path, print) => {
9+
const indentIfNecessary = indentIfNecessaryBuilder(path);
810
const right = [' ', node.operator, line, path.call(print, 'right')];
911
// If it's a single binary operation, avoid having a small right
1012
// operand like - 1 on its own line
@@ -13,7 +15,7 @@ export const exponentiation = {
1315
path.getParentNode().type !== 'BinaryOperation';
1416
return group([
1517
path.call(print, 'left'),
16-
indent(shouldGroup ? group(right) : right)
18+
indentIfNecessary(shouldGroup ? group(right) : right)
1719
]);
1820
}
1921
};

src/binary-operator-printers/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * from './arithmetic.js';
1+
export { arithmetic } from './arithmetic.js';
22
export * from './assignment.js';
33
export * from './bit.js';
44
export * from './comparison.js';

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@ contract ArithmeticOperators {
307307
veryVeryVeryVeryVeryLongVariableCalledB;
308308
a =
309309
veryVeryVeryVeryVeryLongVariableCalledA **
310-
veryVeryVeryVeryVeryLongVariableCalledB;
310+
veryVeryVeryVeryVeryLongVariableCalledB;
311311
a =
312312
veryVeryVeryVeryVeryLongVariableCalledA **
313-
veryVeryVeryVeryVeryLongVariableCalledB *
313+
veryVeryVeryVeryVeryLongVariableCalledB *
314314
c;
315315
if (
316316
veryVeryVeryVeryVeryLongVariableCalledA **
@@ -325,21 +325,21 @@ contract ArithmeticOperators {
325325
for (
326326
a =
327327
veryVeryVeryVeryVeryLongVariableCalledA **
328-
veryVeryVeryVeryVeryLongVariableCalledB;
328+
veryVeryVeryVeryVeryLongVariableCalledB;
329329
a <=
330330
veryVeryVeryVeryVeryLongVariableCalledA **
331331
veryVeryVeryVeryVeryLongVariableCalledB;
332332
a +=
333333
veryVeryVeryVeryVeryLongVariableCalledA **
334-
veryVeryVeryVeryVeryLongVariableCalledB
334+
veryVeryVeryVeryVeryLongVariableCalledB
335335
) {}
336336
a(
337337
veryVeryVeryVeryVeryLongVariableCalledA **
338338
veryVeryVeryVeryVeryLongVariableCalledB
339339
);
340340
return
341341
veryVeryVeryVeryVeryLongVariableCalledA **
342-
veryVeryVeryVeryVeryLongVariableCalledB;
342+
veryVeryVeryVeryVeryLongVariableCalledB;
343343
veryVeryVeryVeryVeryLongFunctionCalledA(
344344
veryVeryVeryVeryVeryLongVariableCalledB
345345
) ** c;
@@ -350,12 +350,12 @@ contract ArithmeticOperators {
350350
veryVeryVeryVeryVeryLongFunctionCalledA(
351351
veryVeryVeryVeryVeryLongVariableCalledB
352352
) **
353-
d;
353+
d;
354354
a =
355355
veryVeryVeryVeryVeryLongFunctionCalledA(
356356
veryVeryVeryVeryVeryLongVariableCalledB
357357
) **
358-
c;
358+
c;
359359
if (
360360
veryVeryVeryVeryVeryLongFunctionCalledA(
361361
veryVeryVeryVeryVeryLongVariableCalledB

0 commit comments

Comments
 (0)