@putout/printer 7.1.2 → 7.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ChangeLog +5 -0
- package/README.md +1 -1
- package/lib/tokenize/statements/if-statement/if-statement.js +4 -0
- package/lib/tokenize/statements/import-declaration/import-declaration.js +2 -3
- package/lib/tokenize/statements/variable-declaration/variable-declaration.js +2 -1
- package/package.json +1 -1
package/ChangeLog
CHANGED
package/README.md
CHANGED
|
@@ -32,6 +32,7 @@ module.exports.IfStatement = {
|
|
|
32
32
|
const consequent = path.get('consequent');
|
|
33
33
|
const alternate = path.get('alternate');
|
|
34
34
|
const isConsequentBlock = consequent.isBlockStatement();
|
|
35
|
+
const isVar = consequent.isVariableDeclaration();
|
|
35
36
|
|
|
36
37
|
if (isConsequentBlock) {
|
|
37
38
|
print.space();
|
|
@@ -41,8 +42,10 @@ module.exports.IfStatement = {
|
|
|
41
42
|
maybe.print.newline(isEmptyBody(consequent));
|
|
42
43
|
} else {
|
|
43
44
|
const is = !isEmptyConsequent(path);
|
|
45
|
+
|
|
44
46
|
maybe.print.newline(is);
|
|
45
47
|
maybe.indent.inc(is);
|
|
48
|
+
maybe.indent(isVar);
|
|
46
49
|
print(consequent);
|
|
47
50
|
maybe.indent.dec(is);
|
|
48
51
|
}
|
|
@@ -56,6 +59,7 @@ module.exports.IfStatement = {
|
|
|
56
59
|
write(' else ');
|
|
57
60
|
traverse(alternate);
|
|
58
61
|
} else if (exists(alternate)) {
|
|
62
|
+
maybe.write.newline(isVar);
|
|
59
63
|
maybe.indent(!isConsequentBlock);
|
|
60
64
|
maybe.write.space(isConsequentBlock);
|
|
61
65
|
write('else');
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const {
|
|
3
|
+
const {parseImportSpecifiers} = require('parse-import-specifiers');
|
|
4
4
|
|
|
5
|
+
const {markAfter} = require('../../mark');
|
|
5
6
|
const {isLast, isNext} = require('../../is');
|
|
6
7
|
|
|
7
|
-
const {parseImportSpecifiers} = require('parse-import-specifiers');
|
|
8
|
-
|
|
9
8
|
const {
|
|
10
9
|
maybePrintAttributes,
|
|
11
10
|
ImportAttribute,
|
|
@@ -21,6 +21,7 @@ const isParentBlock = (path) => /Program|BlockStatement|Export/.test(path.parent
|
|
|
21
21
|
const isInsideBlock = (path) => /^(Program|BlockStatement|TSModuleBlock)$/.test(path.parentPath.type);
|
|
22
22
|
const isParentSwitchCase = (path) => path.parentPath.isSwitchCase();
|
|
23
23
|
const isFirstInSwitch = (path) => path.parentPath.get('consequent.0') === path;
|
|
24
|
+
const isParentIf = (path) => path.parentPath.isIfStatement();
|
|
24
25
|
|
|
25
26
|
module.exports.VariableDeclaration = {
|
|
26
27
|
beforeIf: shouldAddNewlineBefore,
|
|
@@ -73,7 +74,7 @@ module.exports.VariableDeclaration = {
|
|
|
73
74
|
|
|
74
75
|
maybe.indent.dec(n);
|
|
75
76
|
|
|
76
|
-
if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path))
|
|
77
|
+
if (isParentBlock(path) || isParentSwitchCase(path) || isParentTSModuleBlock(path) || isParentIf(path))
|
|
77
78
|
write(';');
|
|
78
79
|
|
|
79
80
|
let wasNewline = false;
|
package/package.json
CHANGED