prettier-plugin-java 1.6.1 → 2.0.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/LICENSE +1 -1
- package/dist/base-cst-printer.js +4 -3
- package/dist/cst-printer.js +1 -0
- package/dist/index.js +1 -0
- package/dist/options.js +2 -0
- package/dist/parser.js +1 -0
- package/dist/printer.js +1 -0
- package/dist/printers/arrays.js +4 -3
- package/dist/printers/blocks-and-statements.js +107 -102
- package/dist/printers/classes.js +152 -151
- package/dist/printers/comments/comments-utils.js +1 -0
- package/dist/printers/comments/format-comments.js +22 -13
- package/dist/printers/comments/handle-comments.js +2 -1
- package/dist/printers/expressions.js +128 -105
- package/dist/printers/interfaces.js +57 -56
- package/dist/printers/lexical-structure.js +5 -4
- package/dist/printers/names.js +9 -8
- package/dist/printers/packages-and-modules.js +73 -59
- package/dist/printers/prettier-builder.js +21 -12
- package/dist/printers/printer-utils.js +64 -56
- package/dist/printers/types-values-and-variables.js +44 -39
- package/dist/src/base-cst-printer.js +77 -0
- package/dist/src/cst-printer.js +37 -0
- package/dist/src/index.js +67 -0
- package/dist/src/options.js +256 -0
- package/dist/src/parser.js +7 -0
- package/dist/src/printer.js +28 -0
- package/dist/src/printers/arrays.js +49 -0
- package/dist/src/printers/blocks-and-statements.js +493 -0
- package/dist/src/printers/classes.js +724 -0
- package/dist/src/printers/comments/comments-utils.js +29 -0
- package/dist/src/printers/comments/format-comments.js +187 -0
- package/dist/src/printers/comments/handle-comments.js +38 -0
- package/dist/src/printers/expressions.js +549 -0
- package/dist/src/printers/interfaces.js +251 -0
- package/dist/src/printers/lexical-structure.js +43 -0
- package/dist/src/printers/names.js +53 -0
- package/dist/src/printers/packages-and-modules.js +185 -0
- package/dist/src/printers/prettier-builder.js +47 -0
- package/dist/src/printers/printer-utils.js +577 -0
- package/dist/src/printers/types-values-and-variables.js +183 -0
- package/dist/src/types/utils.js +29 -0
- package/dist/src/utils/expressions-utils.js +29 -0
- package/dist/src/utils/index.js +10 -0
- package/dist/src/utils/printArgumentListWithBraces.js +21 -0
- package/dist/src/utils/printSingleLambdaInvocation.js +20 -0
- package/dist/test/babel-register.js +3 -0
- package/dist/test/repository-test/core-test.js +12 -0
- package/dist/test/repository-test/jhipster-1-test.js +17 -0
- package/dist/test/repository-test/jhipster-2-test.js +16 -0
- package/dist/test/test-utils.js +215 -0
- package/dist/test/unit-test/annotation_type_declaration/annotation_type_declaration-spec.js +6 -0
- package/dist/test/unit-test/args/args-spec.js +6 -0
- package/dist/test/unit-test/assert/assert-spec.js +6 -0
- package/dist/test/unit-test/binary_expressions/binary_expressions-spec.js +6 -0
- package/dist/test/unit-test/blank_lines/blank_lines-spec.js +6 -0
- package/dist/test/unit-test/bug-fixes/bug-fixes-spec.js +6 -0
- package/dist/test/unit-test/cast/cast-spec.js +6 -0
- package/dist/test/unit-test/char_literal/char_literal-spec.js +6 -0
- package/dist/test/unit-test/classes/multiple_classes-spec.js +6 -0
- package/dist/test/unit-test/comments/comments-spec.js +14 -0
- package/dist/test/unit-test/complex_generic_class/complex_generic_class-spec.js +6 -0
- package/dist/test/unit-test/constructors/constructors-spec.js +6 -0
- package/dist/test/unit-test/empty_statement/empty_statement-spec.js +6 -0
- package/dist/test/unit-test/enum/enum-spec.js +6 -0
- package/dist/test/unit-test/expressions/expressions-spec.js +6 -0
- package/dist/test/unit-test/extends_abstract_class/extends_abstract_class-spec.js +6 -0
- package/dist/test/unit-test/extends_abstract_class_and_implements_interfaces/extends_abstract_class_and_implements_interfaces-spec.js +6 -0
- package/dist/test/unit-test/for/for-spec.js +6 -0
- package/dist/test/unit-test/generic_class/generic_class-spec.js +6 -0
- package/dist/test/unit-test/generic_questionmark/generic_questionmark-spec.js +6 -0
- package/dist/test/unit-test/hello-world/hello-word-spec.js +6 -0
- package/dist/test/unit-test/if/if-spec.js +6 -0
- package/dist/test/unit-test/indent/indent-spec.js +6 -0
- package/dist/test/unit-test/instantiation/instantiation-spec.js +6 -0
- package/dist/test/unit-test/interface/interface-spec.js +6 -0
- package/dist/test/unit-test/lambda/lambda-spec.js +6 -0
- package/dist/test/unit-test/marker_annotations/marker_annotations-spec.js +6 -0
- package/dist/test/unit-test/member_chain/member_chain-spec.js +6 -0
- package/dist/test/unit-test/method_reference/method_reference-spec.js +6 -0
- package/dist/test/unit-test/modifiers/modifiers-spec.js +6 -0
- package/dist/test/unit-test/modules/modules-spec.js +6 -0
- package/dist/test/unit-test/package_and_imports/package_and_imports-spec.js +34 -0
- package/dist/test/unit-test/pattern-matching/pattern-matching-spec.js +6 -0
- package/dist/test/unit-test/prettier-ignore/prettier-ignore-spec.js +28 -0
- package/dist/test/unit-test/records/records-spec.js +6 -0
- package/dist/test/unit-test/return/return-spec.js +6 -0
- package/dist/test/unit-test/sealed/sealed-spec.js +6 -0
- package/dist/test/unit-test/snippets/arrays/array-initializer.spec.js +94 -0
- package/dist/test/unit-test/snippets/arrays/variable-initializer-list.spec.js +19 -0
- package/dist/test/unit-test/snippets/blocks-and-statements/switch.spec.js +26 -0
- package/dist/test/unit-test/snippets/classes/class-body.spec.js +181 -0
- package/dist/test/unit-test/snippets/classes/enum-body.spec.js +87 -0
- package/dist/test/unit-test/snippets/classes/variableDeclarator/test.spec.js +186 -0
- package/dist/test/unit-test/snippets/interfaces/element-value-array-initializer.spec.js +85 -0
- package/dist/test/unit-test/snippets/names/ambiguousName/test.spec.js +19 -0
- package/dist/test/unit-test/snippets/names/expressionName/test.spec.js +19 -0
- package/dist/test/unit-test/snippets/names/methodName/test.spec.js +12 -0
- package/dist/test/unit-test/snippets/names/packageOrTypeName/test.spec.js +19 -0
- package/dist/test/unit-test/snippets/types-values-and-variables/floatingPointType/test.spec.js +19 -0
- package/dist/test/unit-test/snippets/types-values-and-variables/integralType/test.spec.js +40 -0
- package/dist/test/unit-test/snippets/types-values-and-variables/numericType/test.spec.js +88 -0
- package/dist/test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.js +112 -0
- package/dist/test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.js +81 -0
- package/dist/test/unit-test/switch/switch-spec.js +6 -0
- package/dist/test/unit-test/synchronized/synchronized-spec.js +6 -0
- package/dist/test/unit-test/text-blocks/text-block-spec.js +6 -0
- package/dist/test/unit-test/throws/throws-spec.js +6 -0
- package/dist/test/unit-test/try_catch/try_catch-spec.js +6 -0
- package/dist/test/unit-test/types/types-spec.js +6 -0
- package/dist/test/unit-test/variables/variables-spec.js +6 -0
- package/dist/test/unit-test/while/while-spec.js +6 -0
- package/dist/test/unit-test/yield-statement/yield-statement-spec.js +6 -0
- package/dist/types/utils.js +1 -0
- package/dist/utils/expressions-utils.js +1 -0
- package/dist/utils/index.js +4 -1
- package/dist/utils/isEmptyDoc.js +7 -0
- package/dist/utils/printArgumentListWithBraces.js +3 -2
- package/dist/utils/printSingleLambdaInvocation.js +5 -4
- package/package.json +21 -21
- package/dist/utils/constants.js +0 -4
|
@@ -28,15 +28,15 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
28
28
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
29
29
|
}
|
|
30
30
|
InterfacesPrettierVisitor.prototype.interfaceDeclaration = function (ctx) {
|
|
31
|
-
var modifiers = printer_utils_1.sortModifiers(ctx.interfaceModifier);
|
|
31
|
+
var modifiers = (0, printer_utils_1.sortModifiers)(ctx.interfaceModifier);
|
|
32
32
|
var firstAnnotations = this.mapVisit(modifiers[0]);
|
|
33
33
|
var otherModifiers = this.mapVisit(modifiers[1]);
|
|
34
34
|
var declaration = ctx.normalInterfaceDeclaration
|
|
35
35
|
? this.visit(ctx.normalInterfaceDeclaration)
|
|
36
36
|
: this.visit(ctx.annotationTypeDeclaration);
|
|
37
|
-
return printer_utils_1.rejectAndJoin(hardline, [
|
|
38
|
-
printer_utils_1.rejectAndJoin(hardline, firstAnnotations),
|
|
39
|
-
printer_utils_1.rejectAndJoin(" ", [printer_utils_1.rejectAndJoin(" ", otherModifiers), declaration])
|
|
37
|
+
return (0, printer_utils_1.rejectAndJoin)(hardline, [
|
|
38
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
|
|
39
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [(0, printer_utils_1.rejectAndJoin)(" ", otherModifiers), declaration])
|
|
40
40
|
]);
|
|
41
41
|
};
|
|
42
42
|
InterfacesPrettierVisitor.prototype.normalInterfaceDeclaration = function (ctx) {
|
|
@@ -47,16 +47,16 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
47
47
|
var interfaceBody = this.visit(ctx.interfaceBody);
|
|
48
48
|
var extendsInterfacesPart = "";
|
|
49
49
|
if (extendsInterfaces) {
|
|
50
|
-
extendsInterfacesPart = prettier_builder_1.indent(printer_utils_1.rejectAndConcat([softline, extendsInterfaces]));
|
|
50
|
+
extendsInterfacesPart = (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([softline, extendsInterfaces]));
|
|
51
51
|
}
|
|
52
52
|
var interfacePermits = "";
|
|
53
53
|
if (optionalInterfacePermits) {
|
|
54
|
-
interfacePermits = prettier_builder_1.indent(printer_utils_1.rejectAndConcat([softline, optionalInterfacePermits]));
|
|
54
|
+
interfacePermits = (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([softline, optionalInterfacePermits]));
|
|
55
55
|
}
|
|
56
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
57
|
-
prettier_builder_1.group(printer_utils_1.rejectAndJoin(" ", [
|
|
56
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
57
|
+
(0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoin)(" ", [
|
|
58
58
|
ctx.Interface[0],
|
|
59
|
-
prettier_builder_1.concat([typeIdentifier, typeParameters]),
|
|
59
|
+
(0, prettier_builder_1.concat)([typeIdentifier, typeParameters]),
|
|
60
60
|
extendsInterfacesPart,
|
|
61
61
|
interfacePermits
|
|
62
62
|
])),
|
|
@@ -67,13 +67,13 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
67
67
|
if (ctx.annotation) {
|
|
68
68
|
return this.visitSingle(ctx);
|
|
69
69
|
}
|
|
70
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
70
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
71
71
|
};
|
|
72
72
|
InterfacesPrettierVisitor.prototype.extendsInterfaces = function (ctx) {
|
|
73
73
|
var interfaceTypeList = this.visit(ctx.interfaceTypeList);
|
|
74
|
-
return prettier_builder_1.group(printer_utils_1.rejectAndConcat([
|
|
74
|
+
return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([
|
|
75
75
|
ctx.Extends[0],
|
|
76
|
-
prettier_builder_1.indent(printer_utils_1.rejectAndConcat([line, interfaceTypeList]))
|
|
76
|
+
(0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([line, interfaceTypeList]))
|
|
77
77
|
]));
|
|
78
78
|
};
|
|
79
79
|
InterfacesPrettierVisitor.prototype.interfacePermits = function (ctx) {
|
|
@@ -83,29 +83,29 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
83
83
|
var joinedInterfaceMemberDeclaration = "";
|
|
84
84
|
if (ctx.interfaceMemberDeclaration !== undefined) {
|
|
85
85
|
var interfaceMemberDeclaration = this.mapVisit(ctx.interfaceMemberDeclaration);
|
|
86
|
-
var separators = printer_utils_1.getInterfaceBodyDeclarationsSeparator(ctx.interfaceMemberDeclaration);
|
|
87
|
-
joinedInterfaceMemberDeclaration = printer_utils_1.rejectAndJoinSeps(separators, interfaceMemberDeclaration);
|
|
86
|
+
var separators = (0, printer_utils_1.getInterfaceBodyDeclarationsSeparator)(ctx.interfaceMemberDeclaration);
|
|
87
|
+
joinedInterfaceMemberDeclaration = (0, printer_utils_1.rejectAndJoinSeps)(separators, interfaceMemberDeclaration);
|
|
88
88
|
}
|
|
89
|
-
return printer_utils_1.putIntoBraces(joinedInterfaceMemberDeclaration, hardline, ctx.LCurly[0], ctx.RCurly[0]);
|
|
89
|
+
return (0, printer_utils_1.putIntoBraces)(joinedInterfaceMemberDeclaration, hardline, ctx.LCurly[0], ctx.RCurly[0]);
|
|
90
90
|
};
|
|
91
91
|
InterfacesPrettierVisitor.prototype.interfaceMemberDeclaration = function (ctx) {
|
|
92
92
|
if (ctx.Semicolon) {
|
|
93
|
-
return printer_utils_1.displaySemicolon(ctx.Semicolon[0]);
|
|
93
|
+
return (0, printer_utils_1.displaySemicolon)(ctx.Semicolon[0]);
|
|
94
94
|
}
|
|
95
95
|
return this.visitSingle(ctx);
|
|
96
96
|
};
|
|
97
97
|
InterfacesPrettierVisitor.prototype.constantDeclaration = function (ctx) {
|
|
98
|
-
var modifiers = printer_utils_1.sortModifiers(ctx.constantModifier);
|
|
98
|
+
var modifiers = (0, printer_utils_1.sortModifiers)(ctx.constantModifier);
|
|
99
99
|
var firstAnnotations = this.mapVisit(modifiers[0]);
|
|
100
100
|
var otherModifiers = this.mapVisit(modifiers[1]);
|
|
101
101
|
var unannType = this.visit(ctx.unannType);
|
|
102
102
|
var variableDeclaratorList = this.visit(ctx.variableDeclaratorList);
|
|
103
|
-
return printer_utils_1.rejectAndJoin(hardline, [
|
|
104
|
-
printer_utils_1.rejectAndJoin(hardline, firstAnnotations),
|
|
105
|
-
printer_utils_1.rejectAndJoin(" ", [
|
|
106
|
-
printer_utils_1.rejectAndJoin(" ", otherModifiers),
|
|
103
|
+
return (0, printer_utils_1.rejectAndJoin)(hardline, [
|
|
104
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
|
|
105
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [
|
|
106
|
+
(0, printer_utils_1.rejectAndJoin)(" ", otherModifiers),
|
|
107
107
|
unannType,
|
|
108
|
-
printer_utils_1.rejectAndConcat([variableDeclaratorList, ctx.Semicolon[0]])
|
|
108
|
+
(0, printer_utils_1.rejectAndConcat)([variableDeclaratorList, ctx.Semicolon[0]])
|
|
109
109
|
])
|
|
110
110
|
]);
|
|
111
111
|
};
|
|
@@ -113,20 +113,20 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
113
113
|
if (ctx.annotation) {
|
|
114
114
|
return this.visitSingle(ctx);
|
|
115
115
|
}
|
|
116
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
116
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
117
117
|
};
|
|
118
118
|
InterfacesPrettierVisitor.prototype.interfaceMethodDeclaration = function (ctx) {
|
|
119
|
-
var modifiers = printer_utils_1.sortModifiers(ctx.interfaceMethodModifier);
|
|
119
|
+
var modifiers = (0, printer_utils_1.sortModifiers)(ctx.interfaceMethodModifier);
|
|
120
120
|
var firstAnnotations = this.mapVisit(modifiers[0]);
|
|
121
121
|
var otherModifiers = this.mapVisit(modifiers[1]);
|
|
122
122
|
var methodHeader = this.visit(ctx.methodHeader);
|
|
123
123
|
var methodBody = this.visit(ctx.methodBody);
|
|
124
|
-
var separator = printer_utils_1.isStatementEmptyStatement(methodBody) ? "" : " ";
|
|
125
|
-
return printer_utils_1.rejectAndJoin(hardline, [
|
|
126
|
-
printer_utils_1.rejectAndJoin(hardline, firstAnnotations),
|
|
127
|
-
printer_utils_1.rejectAndJoin(" ", [
|
|
128
|
-
printer_utils_1.rejectAndJoin(" ", otherModifiers),
|
|
129
|
-
printer_utils_1.rejectAndJoin(separator, [methodHeader, methodBody])
|
|
124
|
+
var separator = (0, printer_utils_1.isStatementEmptyStatement)(methodBody) ? "" : " ";
|
|
125
|
+
return (0, printer_utils_1.rejectAndJoin)(hardline, [
|
|
126
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
|
|
127
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [
|
|
128
|
+
(0, printer_utils_1.rejectAndJoin)(" ", otherModifiers),
|
|
129
|
+
(0, printer_utils_1.rejectAndJoin)(separator, [methodHeader, methodBody])
|
|
130
130
|
])
|
|
131
131
|
]);
|
|
132
132
|
};
|
|
@@ -134,51 +134,51 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
134
134
|
if (ctx.annotation) {
|
|
135
135
|
return this.visitSingle(ctx);
|
|
136
136
|
}
|
|
137
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
137
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
138
138
|
};
|
|
139
139
|
InterfacesPrettierVisitor.prototype.annotationTypeDeclaration = function (ctx) {
|
|
140
140
|
var typeIdentifier = this.visit(ctx.typeIdentifier);
|
|
141
141
|
var annotationTypeBody = this.visit(ctx.annotationTypeBody);
|
|
142
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
143
|
-
prettier_builder_1.concat([ctx.At[0], ctx.Interface[0]]),
|
|
142
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
143
|
+
(0, prettier_builder_1.concat)([ctx.At[0], ctx.Interface[0]]),
|
|
144
144
|
typeIdentifier,
|
|
145
145
|
annotationTypeBody
|
|
146
146
|
]);
|
|
147
147
|
};
|
|
148
148
|
InterfacesPrettierVisitor.prototype.annotationTypeBody = function (ctx) {
|
|
149
149
|
var annotationTypeMemberDeclaration = this.mapVisit(ctx.annotationTypeMemberDeclaration);
|
|
150
|
-
return printer_utils_1.rejectAndJoin(line, [
|
|
151
|
-
prettier_builder_1.indent(printer_utils_1.rejectAndJoin(line, [
|
|
150
|
+
return (0, printer_utils_1.rejectAndJoin)(line, [
|
|
151
|
+
(0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndJoin)(line, [
|
|
152
152
|
ctx.LCurly[0],
|
|
153
|
-
printer_utils_1.rejectAndJoin(prettier_builder_1.concat([line, line]), annotationTypeMemberDeclaration)
|
|
153
|
+
(0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([line, line]), annotationTypeMemberDeclaration)
|
|
154
154
|
])),
|
|
155
155
|
ctx.RCurly[0]
|
|
156
156
|
]);
|
|
157
157
|
};
|
|
158
158
|
InterfacesPrettierVisitor.prototype.annotationTypeMemberDeclaration = function (ctx) {
|
|
159
159
|
if (ctx.Semicolon) {
|
|
160
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
160
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
161
161
|
}
|
|
162
162
|
return this.visitSingle(ctx);
|
|
163
163
|
};
|
|
164
164
|
InterfacesPrettierVisitor.prototype.annotationTypeElementDeclaration = function (ctx) {
|
|
165
|
-
var modifiers = printer_utils_1.sortModifiers(ctx.annotationTypeElementModifier);
|
|
165
|
+
var modifiers = (0, printer_utils_1.sortModifiers)(ctx.annotationTypeElementModifier);
|
|
166
166
|
var firstAnnotations = this.mapVisit(modifiers[0]);
|
|
167
167
|
var otherModifiers = this.mapVisit(modifiers[1]);
|
|
168
168
|
var unannType = this.visit(ctx.unannType);
|
|
169
169
|
var identifier = ctx.Identifier[0];
|
|
170
170
|
var dims = this.visit(ctx.dims);
|
|
171
171
|
var defaultValue = ctx.defaultValue
|
|
172
|
-
? prettier_builder_1.concat([" ", this.visit(ctx.defaultValue)])
|
|
172
|
+
? (0, prettier_builder_1.concat)([" ", this.visit(ctx.defaultValue)])
|
|
173
173
|
: "";
|
|
174
|
-
return printer_utils_1.rejectAndJoin(hardline, [
|
|
175
|
-
printer_utils_1.rejectAndJoin(hardline, firstAnnotations),
|
|
176
|
-
printer_utils_1.rejectAndJoin(" ", [
|
|
177
|
-
printer_utils_1.rejectAndJoin(" ", otherModifiers),
|
|
174
|
+
return (0, printer_utils_1.rejectAndJoin)(hardline, [
|
|
175
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
|
|
176
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [
|
|
177
|
+
(0, printer_utils_1.rejectAndJoin)(" ", otherModifiers),
|
|
178
178
|
unannType,
|
|
179
|
-
printer_utils_1.rejectAndConcat([
|
|
179
|
+
(0, printer_utils_1.rejectAndConcat)([
|
|
180
180
|
identifier,
|
|
181
|
-
prettier_builder_1.concat([ctx.LBrace[0], ctx.RBrace[0]]),
|
|
181
|
+
(0, prettier_builder_1.concat)([ctx.LBrace[0], ctx.RBrace[0]]),
|
|
182
182
|
dims,
|
|
183
183
|
defaultValue,
|
|
184
184
|
ctx.Semicolon[0]
|
|
@@ -190,41 +190,41 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
190
190
|
if (ctx.annotation) {
|
|
191
191
|
return this.visitSingle(ctx);
|
|
192
192
|
}
|
|
193
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
193
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
194
194
|
};
|
|
195
195
|
InterfacesPrettierVisitor.prototype.defaultValue = function (ctx) {
|
|
196
196
|
var elementValue = this.visit(ctx.elementValue);
|
|
197
|
-
return printer_utils_1.rejectAndJoin(" ", [ctx.Default[0], elementValue]);
|
|
197
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Default[0], elementValue]);
|
|
198
198
|
};
|
|
199
199
|
InterfacesPrettierVisitor.prototype.annotation = function (ctx) {
|
|
200
200
|
var fqn = this.visit(ctx.typeName);
|
|
201
201
|
var annoArgs = "";
|
|
202
202
|
if (ctx.LBrace) {
|
|
203
203
|
if (ctx.elementValuePairList) {
|
|
204
|
-
annoArgs = printer_utils_1.putIntoBraces(this.visit(ctx.elementValuePairList), softline, ctx.LBrace[0], ctx.RBrace[0]);
|
|
204
|
+
annoArgs = (0, printer_utils_1.putIntoBraces)(this.visit(ctx.elementValuePairList), softline, ctx.LBrace[0], ctx.RBrace[0]);
|
|
205
205
|
}
|
|
206
206
|
else if (ctx.elementValue) {
|
|
207
|
-
annoArgs = printer_utils_1.putIntoBraces(this.visit(ctx.elementValue), softline, ctx.LBrace[0], ctx.RBrace[0]);
|
|
207
|
+
annoArgs = (0, printer_utils_1.putIntoBraces)(this.visit(ctx.elementValue), softline, ctx.LBrace[0], ctx.RBrace[0]);
|
|
208
208
|
}
|
|
209
209
|
}
|
|
210
|
-
return prettier_builder_1.group(printer_utils_1.rejectAndConcat([ctx.At[0], fqn, annoArgs]));
|
|
210
|
+
return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([ctx.At[0], fqn, annoArgs]));
|
|
211
211
|
};
|
|
212
212
|
InterfacesPrettierVisitor.prototype.elementValuePairList = function (ctx) {
|
|
213
213
|
var elementValuePairs = this.mapVisit(ctx.elementValuePair);
|
|
214
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
|
|
215
|
-
return printer_utils_1.rejectAndJoinSeps(commas, elementValuePairs);
|
|
214
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
|
|
215
|
+
return (0, printer_utils_1.rejectAndJoinSeps)(commas, elementValuePairs);
|
|
216
216
|
};
|
|
217
217
|
InterfacesPrettierVisitor.prototype.elementValuePair = function (ctx) {
|
|
218
218
|
var identifier = ctx.Identifier[0];
|
|
219
219
|
var elementValue = this.visit(ctx.elementValue);
|
|
220
|
-
return printer_utils_1.rejectAndJoin(" ", [identifier, ctx.Equals[0], elementValue]);
|
|
220
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [identifier, ctx.Equals[0], elementValue]);
|
|
221
221
|
};
|
|
222
222
|
InterfacesPrettierVisitor.prototype.elementValue = function (ctx) {
|
|
223
223
|
return this.visitSingle(ctx);
|
|
224
224
|
};
|
|
225
225
|
InterfacesPrettierVisitor.prototype.elementValueArrayInitializer = function (ctx) {
|
|
226
226
|
var elementValueList = this.visit(ctx.elementValueList);
|
|
227
|
-
return printer_utils_1.printArrayList({
|
|
227
|
+
return (0, printer_utils_1.printArrayList)({
|
|
228
228
|
list: elementValueList,
|
|
229
229
|
extraComma: ctx.Comma,
|
|
230
230
|
LCurly: ctx.LCurly[0],
|
|
@@ -234,8 +234,8 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
234
234
|
};
|
|
235
235
|
InterfacesPrettierVisitor.prototype.elementValueList = function (ctx) {
|
|
236
236
|
var elementValues = this.mapVisit(ctx.elementValue);
|
|
237
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
|
|
238
|
-
return prettier_builder_1.group(printer_utils_1.rejectAndConcat([printer_utils_1.rejectAndJoinSeps(commas, elementValues)]));
|
|
237
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
|
|
238
|
+
return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([(0, printer_utils_1.rejectAndJoinSeps)(commas, elementValues)]));
|
|
239
239
|
};
|
|
240
240
|
InterfacesPrettierVisitor.prototype.identifyInterfaceBodyDeclarationType = function () {
|
|
241
241
|
return "identifyInterfaceBodyDeclarationType";
|
|
@@ -249,3 +249,4 @@ var InterfacesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
249
249
|
return InterfacesPrettierVisitor;
|
|
250
250
|
}(base_cst_printer_1.BaseCstPrettierPrinter));
|
|
251
251
|
exports.InterfacesPrettierVisitor = InterfacesPrettierVisitor;
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/printers/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,19 +25,20 @@ var LexicalStructurePrettierVisitor = /** @class */ (function (_super) {
|
|
|
25
25
|
}
|
|
26
26
|
LexicalStructurePrettierVisitor.prototype.literal = function (ctx) {
|
|
27
27
|
if (ctx.CharLiteral || ctx.TextBlock || ctx.StringLiteral || ctx.Null) {
|
|
28
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
28
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
29
29
|
}
|
|
30
30
|
return this.visitSingle(ctx);
|
|
31
31
|
};
|
|
32
32
|
LexicalStructurePrettierVisitor.prototype.integerLiteral = function (ctx) {
|
|
33
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
33
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
34
34
|
};
|
|
35
35
|
LexicalStructurePrettierVisitor.prototype.floatingPointLiteral = function (ctx) {
|
|
36
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
36
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
37
37
|
};
|
|
38
38
|
LexicalStructurePrettierVisitor.prototype.booleanLiteral = function (ctx) {
|
|
39
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
39
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
40
40
|
};
|
|
41
41
|
return LexicalStructurePrettierVisitor;
|
|
42
42
|
}(base_cst_printer_1.BaseCstPrettierPrinter));
|
|
43
43
|
exports.LexicalStructurePrettierVisitor = LexicalStructurePrettierVisitor;
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGV4aWNhbC1zdHJ1Y3R1cmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJpbnRlcnMvbGV4aWNhbC1zdHJ1Y3R1cmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQW9FO0FBQ3BFLHdEQUE2RDtBQVM3RDtJQUFxRCxtREFBc0I7SUFBM0U7O0lBbUJBLENBQUM7SUFsQkMsaURBQU8sR0FBUCxVQUFRLEdBQWU7UUFDckIsSUFBSSxHQUFHLENBQUMsV0FBVyxJQUFJLEdBQUcsQ0FBQyxTQUFTLElBQUksR0FBRyxDQUFDLGFBQWEsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFO1lBQ3JFLE9BQU8sSUFBQSx3Q0FBc0IsRUFBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBVyxDQUFDLENBQUM7U0FDOUQ7UUFDRCxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELHdEQUFjLEdBQWQsVUFBZSxHQUFzQjtRQUNuQyxPQUFPLElBQUEsd0NBQXNCLEVBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQVcsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCw4REFBb0IsR0FBcEIsVUFBcUIsR0FBNEI7UUFDL0MsT0FBTyxJQUFBLHdDQUFzQixFQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFXLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsd0RBQWMsR0FBZCxVQUFlLEdBQXNCO1FBQ25DLE9BQU8sSUFBQSx3Q0FBc0IsRUFBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBVyxDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUNILHNDQUFDO0FBQUQsQ0FBQyxBQW5CRCxDQUFxRCx5Q0FBc0IsR0FtQjFFO0FBbkJZLDBFQUErQiJ9
|
package/dist/printers/names.js
CHANGED
|
@@ -25,29 +25,30 @@ var NamesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
25
25
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
26
26
|
}
|
|
27
27
|
NamesPrettierVisitor.prototype.typeIdentifier = function (ctx) {
|
|
28
|
-
return format_comments_1.printTokenWithComments(ctx.Identifier[0]);
|
|
28
|
+
return (0, format_comments_1.printTokenWithComments)(ctx.Identifier[0]);
|
|
29
29
|
};
|
|
30
30
|
NamesPrettierVisitor.prototype.moduleName = function (ctx) {
|
|
31
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
31
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
32
32
|
};
|
|
33
33
|
NamesPrettierVisitor.prototype.packageName = function (ctx) {
|
|
34
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
34
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
35
35
|
};
|
|
36
36
|
NamesPrettierVisitor.prototype.typeName = function (ctx) {
|
|
37
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
37
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
38
38
|
};
|
|
39
39
|
NamesPrettierVisitor.prototype.expressionName = function (ctx) {
|
|
40
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
40
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
41
41
|
};
|
|
42
42
|
NamesPrettierVisitor.prototype.methodName = function (ctx) {
|
|
43
|
-
return format_comments_1.printTokenWithComments(ctx.Identifier[0]);
|
|
43
|
+
return (0, format_comments_1.printTokenWithComments)(ctx.Identifier[0]);
|
|
44
44
|
};
|
|
45
45
|
NamesPrettierVisitor.prototype.packageOrTypeName = function (ctx) {
|
|
46
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
46
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
47
47
|
};
|
|
48
48
|
NamesPrettierVisitor.prototype.ambiguousName = function (ctx) {
|
|
49
|
-
return printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
49
|
+
return (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
50
50
|
};
|
|
51
51
|
return NamesPrettierVisitor;
|
|
52
52
|
}(base_cst_printer_1.BaseCstPrettierPrinter));
|
|
53
53
|
exports.NamesPrettierVisitor = NamesPrettierVisitor;
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmFtZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJpbnRlcnMvbmFtZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFYixpREFBMkM7QUFDM0MsOERBQW9FO0FBQ3BFLHdEQUE2RDtBQVk3RDtJQUEwQyx3Q0FBc0I7SUFBaEU7O0lBZ0NBLENBQUM7SUEvQkMsNkNBQWMsR0FBZCxVQUFlLEdBQXNCO1FBQ25DLE9BQU8sSUFBQSx3Q0FBc0IsRUFBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELHlDQUFVLEdBQVYsVUFBVyxHQUFrQjtRQUMzQixPQUFPLElBQUEsd0JBQVEsRUFBQyxHQUFHLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsMENBQVcsR0FBWCxVQUFZLEdBQW1CO1FBQzdCLE9BQU8sSUFBQSx3QkFBUSxFQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCx1Q0FBUSxHQUFSLFVBQVMsR0FBZ0I7UUFDdkIsT0FBTyxJQUFBLHdCQUFRLEVBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELDZDQUFjLEdBQWQsVUFBZSxHQUFzQjtRQUNuQyxPQUFPLElBQUEsd0JBQVEsRUFBQyxHQUFHLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQseUNBQVUsR0FBVixVQUFXLEdBQWtCO1FBQzNCLE9BQU8sSUFBQSx3Q0FBc0IsRUFBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkQsQ0FBQztJQUVELGdEQUFpQixHQUFqQixVQUFrQixHQUF5QjtRQUN6QyxPQUFPLElBQUEsd0JBQVEsRUFBQyxHQUFHLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsNENBQWEsR0FBYixVQUFjLEdBQXFCO1FBQ2pDLE9BQU8sSUFBQSx3QkFBUSxFQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFDSCwyQkFBQztBQUFELENBQUMsQUFoQ0QsQ0FBMEMseUNBQXNCLEdBZ0MvRDtBQWhDWSxvREFBb0IifQ==
|
|
@@ -29,46 +29,46 @@ var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
29
29
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
30
30
|
}
|
|
31
31
|
PackagesAndModulesPrettierVisitor.prototype.compilationUnit = function (ctx) {
|
|
32
|
-
var compilationUnit = utils_1.isOrdinaryCompilationUnitCtx(ctx)
|
|
32
|
+
var compilationUnit = (0, utils_1.isOrdinaryCompilationUnitCtx)(ctx)
|
|
33
33
|
? ctx.ordinaryCompilationUnit
|
|
34
34
|
: ctx.modularCompilationUnit;
|
|
35
|
-
return prettier_builder_1.concat([this.visit(compilationUnit[0]), line]);
|
|
35
|
+
return (0, prettier_builder_1.concat)([this.visit(compilationUnit[0]), line]);
|
|
36
36
|
};
|
|
37
37
|
PackagesAndModulesPrettierVisitor.prototype.ordinaryCompilationUnit = function (ctx) {
|
|
38
38
|
var packageDecl = this.visit(ctx.packageDeclaration);
|
|
39
|
-
var sortedImportsDecl = printer_utils_1.sortImports(ctx.importDeclaration);
|
|
39
|
+
var sortedImportsDecl = (0, printer_utils_1.sortImports)(ctx.importDeclaration);
|
|
40
40
|
var nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
|
|
41
41
|
var staticImports = this.mapVisit(sortedImportsDecl.staticImports);
|
|
42
42
|
var typesDecl = this.mapVisit(ctx.typeDeclaration);
|
|
43
43
|
// TODO: utility to add item+line (or multiple lines) but only if an item exists
|
|
44
|
-
return printer_utils_1.rejectAndConcat([
|
|
45
|
-
printer_utils_1.rejectAndJoin(prettier_builder_1.concat([hardline, hardline]), [
|
|
44
|
+
return (0, printer_utils_1.rejectAndConcat)([
|
|
45
|
+
(0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), [
|
|
46
46
|
packageDecl,
|
|
47
|
-
printer_utils_1.rejectAndJoin(hardline, staticImports),
|
|
48
|
-
printer_utils_1.rejectAndJoin(hardline, nonStaticImports),
|
|
49
|
-
printer_utils_1.rejectAndJoin(prettier_builder_1.concat([hardline, hardline]), typesDecl)
|
|
47
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, staticImports),
|
|
48
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, nonStaticImports),
|
|
49
|
+
(0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), typesDecl)
|
|
50
50
|
])
|
|
51
51
|
]);
|
|
52
52
|
};
|
|
53
53
|
PackagesAndModulesPrettierVisitor.prototype.modularCompilationUnit = function (ctx) {
|
|
54
|
-
var sortedImportsDecl = printer_utils_1.sortImports(ctx.importDeclaration);
|
|
54
|
+
var sortedImportsDecl = (0, printer_utils_1.sortImports)(ctx.importDeclaration);
|
|
55
55
|
var nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
|
|
56
56
|
var staticImports = this.mapVisit(sortedImportsDecl.staticImports);
|
|
57
57
|
var moduleDeclaration = this.visit(ctx.moduleDeclaration);
|
|
58
|
-
return printer_utils_1.rejectAndConcat([
|
|
59
|
-
printer_utils_1.rejectAndJoin(prettier_builder_1.concat([hardline, hardline]), [
|
|
60
|
-
printer_utils_1.rejectAndJoin(hardline, staticImports),
|
|
61
|
-
printer_utils_1.rejectAndJoin(hardline, nonStaticImports),
|
|
58
|
+
return (0, printer_utils_1.rejectAndConcat)([
|
|
59
|
+
(0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), [
|
|
60
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, staticImports),
|
|
61
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, nonStaticImports),
|
|
62
62
|
moduleDeclaration
|
|
63
63
|
])
|
|
64
64
|
]);
|
|
65
65
|
};
|
|
66
66
|
PackagesAndModulesPrettierVisitor.prototype.packageDeclaration = function (ctx) {
|
|
67
67
|
var modifiers = this.mapVisit(ctx.packageModifier);
|
|
68
|
-
var name = printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
69
|
-
return printer_utils_1.rejectAndJoin(hardline, [
|
|
70
|
-
printer_utils_1.rejectAndJoin(hardline, modifiers),
|
|
71
|
-
prettier_builder_1.concat([ctx.Package[0], " ", name, ctx.Semicolon[0]])
|
|
68
|
+
var name = (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
69
|
+
return (0, printer_utils_1.rejectAndJoin)(hardline, [
|
|
70
|
+
(0, printer_utils_1.rejectAndJoin)(hardline, modifiers),
|
|
71
|
+
(0, prettier_builder_1.concat)([ctx.Package[0], " ", name, ctx.Semicolon[0]])
|
|
72
72
|
]);
|
|
73
73
|
};
|
|
74
74
|
PackagesAndModulesPrettierVisitor.prototype.packageModifier = function (ctx) {
|
|
@@ -80,31 +80,31 @@ var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
80
80
|
}
|
|
81
81
|
var optionalStatic = ctx.Static ? ctx.Static[0] : "";
|
|
82
82
|
var packageOrTypeName = this.visit(ctx.packageOrTypeName);
|
|
83
|
-
var optionalDotStar = ctx.Dot ? prettier_builder_1.concat([ctx.Dot[0], ctx.Star[0]]) : "";
|
|
84
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
83
|
+
var optionalDotStar = ctx.Dot ? (0, prettier_builder_1.concat)([ctx.Dot[0], ctx.Star[0]]) : "";
|
|
84
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
85
85
|
ctx.Import[0],
|
|
86
86
|
optionalStatic,
|
|
87
|
-
printer_utils_1.rejectAndConcat([packageOrTypeName, optionalDotStar, ctx.Semicolon[0]])
|
|
87
|
+
(0, printer_utils_1.rejectAndConcat)([packageOrTypeName, optionalDotStar, ctx.Semicolon[0]])
|
|
88
88
|
]);
|
|
89
89
|
};
|
|
90
90
|
PackagesAndModulesPrettierVisitor.prototype.typeDeclaration = function (ctx) {
|
|
91
91
|
if (ctx.Semicolon) {
|
|
92
|
-
return printer_utils_1.displaySemicolon(ctx.Semicolon[0]);
|
|
92
|
+
return (0, printer_utils_1.displaySemicolon)(ctx.Semicolon[0]);
|
|
93
93
|
}
|
|
94
94
|
return this.visitSingle(ctx);
|
|
95
95
|
};
|
|
96
96
|
PackagesAndModulesPrettierVisitor.prototype.moduleDeclaration = function (ctx) {
|
|
97
97
|
var annotations = this.mapVisit(ctx.annotation);
|
|
98
98
|
var optionalOpen = ctx.Open ? ctx.Open[0] : "";
|
|
99
|
-
var name = printer_utils_1.buildFqn(ctx.Identifier, ctx.Dot);
|
|
99
|
+
var name = (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
|
|
100
100
|
var moduleDirectives = this.mapVisit(ctx.moduleDirective);
|
|
101
|
-
var content = printer_utils_1.rejectAndJoinSeps(printer_utils_1.getBlankLinesSeparator(ctx.moduleDirective), moduleDirectives);
|
|
102
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
103
|
-
prettier_builder_1.join(" ", annotations),
|
|
101
|
+
var content = (0, printer_utils_1.rejectAndJoinSeps)((0, printer_utils_1.getBlankLinesSeparator)(ctx.moduleDirective), moduleDirectives);
|
|
102
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
103
|
+
(0, prettier_builder_1.join)(" ", annotations),
|
|
104
104
|
optionalOpen,
|
|
105
105
|
ctx.Module[0],
|
|
106
106
|
name,
|
|
107
|
-
printer_utils_1.putIntoBraces(content, hardline, ctx.LCurly[0], ctx.RCurly[0])
|
|
107
|
+
(0, printer_utils_1.putIntoBraces)(content, hardline, ctx.LCurly[0], ctx.RCurly[0])
|
|
108
108
|
]);
|
|
109
109
|
};
|
|
110
110
|
PackagesAndModulesPrettierVisitor.prototype.moduleDirective = function (ctx) {
|
|
@@ -113,48 +113,61 @@ var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
113
113
|
PackagesAndModulesPrettierVisitor.prototype.requiresModuleDirective = function (ctx) {
|
|
114
114
|
var modifiers = this.mapVisit(ctx.requiresModifier);
|
|
115
115
|
var moduleName = this.visit(ctx.moduleName);
|
|
116
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
116
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
117
117
|
ctx.Requires[0],
|
|
118
|
-
prettier_builder_1.join(" ", modifiers),
|
|
119
|
-
prettier_builder_1.concat([moduleName, ctx.Semicolon[0]])
|
|
118
|
+
(0, prettier_builder_1.join)(" ", modifiers),
|
|
119
|
+
(0, prettier_builder_1.concat)([moduleName, ctx.Semicolon[0]])
|
|
120
120
|
]);
|
|
121
121
|
};
|
|
122
122
|
PackagesAndModulesPrettierVisitor.prototype.exportsModuleDirective = function (ctx) {
|
|
123
123
|
var packageName = this.visit(ctx.packageName);
|
|
124
|
-
var to = ctx.To ? ctx.To[0] : "";
|
|
125
124
|
var moduleNames = this.mapVisit(ctx.moduleName);
|
|
126
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
printer_utils_1.rejectAndJoin(
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
125
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
|
|
126
|
+
if (ctx.To) {
|
|
127
|
+
return group((0, printer_utils_1.rejectAndConcat)([
|
|
128
|
+
indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
129
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [ctx.Exports[0], packageName]),
|
|
130
|
+
group(indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
131
|
+
ctx.To[0],
|
|
132
|
+
(0, printer_utils_1.rejectAndJoinSeps)(commas, moduleNames)
|
|
133
|
+
])))
|
|
134
|
+
])),
|
|
135
|
+
ctx.Semicolon[0]
|
|
136
|
+
]));
|
|
137
|
+
}
|
|
138
|
+
return (0, printer_utils_1.rejectAndConcat)([
|
|
139
|
+
(0, prettier_builder_1.concat)([ctx.Exports[0], " "]),
|
|
140
|
+
packageName,
|
|
135
141
|
ctx.Semicolon[0]
|
|
136
|
-
])
|
|
142
|
+
]);
|
|
137
143
|
};
|
|
138
144
|
PackagesAndModulesPrettierVisitor.prototype.opensModuleDirective = function (ctx) {
|
|
139
145
|
var packageName = this.visit(ctx.packageName);
|
|
140
146
|
var to = ctx.To ? ctx.To[0] : "";
|
|
141
147
|
var moduleNames = this.mapVisit(ctx.moduleName);
|
|
142
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
printer_utils_1.rejectAndJoin(
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
148
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
|
|
149
|
+
if (ctx.To) {
|
|
150
|
+
return group((0, printer_utils_1.rejectAndConcat)([
|
|
151
|
+
indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
152
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [ctx.Opens[0], packageName]),
|
|
153
|
+
group(indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
154
|
+
ctx.To[0],
|
|
155
|
+
(0, printer_utils_1.rejectAndJoinSeps)(commas, moduleNames)
|
|
156
|
+
])))
|
|
157
|
+
])),
|
|
158
|
+
ctx.Semicolon[0]
|
|
159
|
+
]));
|
|
160
|
+
}
|
|
161
|
+
return (0, printer_utils_1.rejectAndConcat)([
|
|
162
|
+
(0, prettier_builder_1.concat)([ctx.Opens[0], " "]),
|
|
163
|
+
packageName,
|
|
151
164
|
ctx.Semicolon[0]
|
|
152
|
-
])
|
|
165
|
+
]);
|
|
153
166
|
};
|
|
154
167
|
PackagesAndModulesPrettierVisitor.prototype.usesModuleDirective = function (ctx) {
|
|
155
168
|
var typeName = this.visit(ctx.typeName);
|
|
156
|
-
return printer_utils_1.rejectAndConcat([
|
|
157
|
-
prettier_builder_1.concat([ctx.Uses[0], " "]),
|
|
169
|
+
return (0, printer_utils_1.rejectAndConcat)([
|
|
170
|
+
(0, prettier_builder_1.concat)([ctx.Uses[0], " "]),
|
|
158
171
|
typeName,
|
|
159
172
|
ctx.Semicolon[0]
|
|
160
173
|
]);
|
|
@@ -162,20 +175,20 @@ var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
162
175
|
PackagesAndModulesPrettierVisitor.prototype.providesModuleDirective = function (ctx) {
|
|
163
176
|
var firstTypeName = this.visit(ctx.typeName[0]);
|
|
164
177
|
var otherTypeNames = this.mapVisit(ctx.typeName.slice(1));
|
|
165
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
|
|
166
|
-
return group(printer_utils_1.rejectAndConcat([
|
|
167
|
-
indent(printer_utils_1.rejectAndJoin(line, [
|
|
168
|
-
printer_utils_1.rejectAndJoin(" ", [ctx.Provides[0], firstTypeName]),
|
|
169
|
-
group(indent(printer_utils_1.rejectAndJoin(line, [
|
|
178
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
|
|
179
|
+
return group((0, printer_utils_1.rejectAndConcat)([
|
|
180
|
+
indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
181
|
+
(0, printer_utils_1.rejectAndJoin)(" ", [ctx.Provides[0], firstTypeName]),
|
|
182
|
+
group(indent((0, printer_utils_1.rejectAndJoin)(line, [
|
|
170
183
|
ctx.With[0],
|
|
171
|
-
printer_utils_1.rejectAndJoinSeps(commas, otherTypeNames)
|
|
184
|
+
(0, printer_utils_1.rejectAndJoinSeps)(commas, otherTypeNames)
|
|
172
185
|
])))
|
|
173
186
|
])),
|
|
174
187
|
ctx.Semicolon[0]
|
|
175
188
|
]));
|
|
176
189
|
};
|
|
177
190
|
PackagesAndModulesPrettierVisitor.prototype.requiresModifier = function (ctx) {
|
|
178
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
191
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
179
192
|
};
|
|
180
193
|
PackagesAndModulesPrettierVisitor.prototype.isModuleCompilationUnit = function () {
|
|
181
194
|
return "isModuleCompilationUnit";
|
|
@@ -183,3 +196,4 @@ var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
183
196
|
return PackagesAndModulesPrettierVisitor;
|
|
184
197
|
}(base_cst_printer_1.BaseCstPrettierPrinter));
|
|
185
198
|
exports.PackagesAndModulesPrettierVisitor = PackagesAndModulesPrettierVisitor;
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"packages-and-modules.js","sourceRoot":"","sources":["../../src/printers/packages-and-modules.ts"],"names":[],"mappings":"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"}
|