prettier-plugin-java 1.6.2 → 2.1.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 +3 -3
- package/dist/index.js +2 -2
- package/dist/options.js +1 -0
- package/dist/printers/arrays.js +3 -3
- package/dist/printers/blocks-and-statements.js +106 -102
- package/dist/printers/classes.js +176 -160
- package/dist/printers/comments/format-comments.js +21 -13
- package/dist/printers/comments/handle-comments.js +1 -1
- package/dist/printers/expressions.js +127 -105
- package/dist/printers/interfaces.js +56 -56
- package/dist/printers/lexical-structure.js +4 -4
- package/dist/printers/names.js +8 -8
- package/dist/printers/packages-and-modules.js +72 -59
- package/dist/printers/prettier-builder.js +24 -12
- package/dist/printers/printer-utils.js +63 -56
- package/dist/printers/types-values-and-variables.js +43 -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/utils/index.js +3 -1
- package/dist/utils/isEmptyDoc.js +6 -0
- package/dist/utils/printArgumentListWithBraces.js +2 -2
- package/dist/utils/printSingleLambdaInvocation.js +4 -4
- package/package.json +21 -21
- package/dist/utils/constants.js +0 -4
|
@@ -10,28 +10,32 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
14
|
-
for (var i = 0,
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
14
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
15
|
+
if (ar || !(i in from)) {
|
|
16
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
17
|
+
ar[i] = from[i];
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
17
21
|
};
|
|
18
22
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
24
|
};
|
|
21
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
26
|
exports.printArrayList = exports.isUniqueMethodInvocation = exports.sortImports = exports.isStatementEmptyStatement = exports.isShiftOperator = exports.separateTokensIntoGroups = exports.putIntoBraces = exports.getInterfaceBodyDeclarationsSeparator = exports.getClassBodyDeclarationsSeparator = exports.getBlankLinesSeparator = exports.isExplicitLambdaParameter = exports.displaySemicolon = exports.findDeepElementInPartsArray = exports.sortModifiers = exports.sortClassTypeChildren = exports.matchCategory = exports.sortNodes = exports.sortAnnotationIdentifier = exports.rejectAndConcat = exports.rejectAndJoin = exports.rejectSeparators = exports.reject = exports.rejectAndJoinSeps = exports.buildFqn = void 0;
|
|
27
|
+
var findIndex_1 = __importDefault(require("lodash/findIndex"));
|
|
28
|
+
var findLastIndex_1 = __importDefault(require("lodash/findLastIndex"));
|
|
23
29
|
var forEach_1 = __importDefault(require("lodash/forEach"));
|
|
24
30
|
var forEachRight_1 = __importDefault(require("lodash/forEachRight"));
|
|
25
|
-
var findLastIndex_1 = __importDefault(require("lodash/findLastIndex"));
|
|
26
|
-
var findIndex_1 = __importDefault(require("lodash/findIndex"));
|
|
27
31
|
var includes_1 = __importDefault(require("lodash/includes"));
|
|
28
|
-
var prettier_builder_1 = require("./prettier-builder");
|
|
29
|
-
var format_comments_1 = require("./comments/format-comments");
|
|
30
|
-
var comments_utils_1 = require("./comments/comments-utils");
|
|
31
32
|
var doc_1 = require("prettier/doc");
|
|
32
33
|
var utils_1 = require("../types/utils");
|
|
34
|
+
var utils_2 = require("../utils");
|
|
35
|
+
var comments_utils_1 = require("./comments/comments-utils");
|
|
36
|
+
var format_comments_1 = require("./comments/format-comments");
|
|
37
|
+
var prettier_builder_1 = require("./prettier-builder");
|
|
33
38
|
var indent = doc_1.builders.indent, hardline = doc_1.builders.hardline, line = doc_1.builders.line;
|
|
34
|
-
var isConcat = doc_1.utils.isConcat;
|
|
35
39
|
var orderedModifiers = [
|
|
36
40
|
"Public",
|
|
37
41
|
"Protected",
|
|
@@ -65,7 +69,7 @@ function rejectAndJoinSeps(sepTokens, elems, sep) {
|
|
|
65
69
|
}
|
|
66
70
|
}
|
|
67
71
|
res.push.apply(res, actualElements.slice(sepTokens.length));
|
|
68
|
-
return prettier_builder_1.concat(res);
|
|
72
|
+
return (0, prettier_builder_1.concat)(res);
|
|
69
73
|
}
|
|
70
74
|
exports.rejectAndJoinSeps = rejectAndJoinSeps;
|
|
71
75
|
function reject(elems) {
|
|
@@ -92,24 +96,24 @@ function rejectSeparators(separators, elems) {
|
|
|
92
96
|
exports.rejectSeparators = rejectSeparators;
|
|
93
97
|
function rejectAndJoin(sep, elems) {
|
|
94
98
|
var actualElements = reject(elems);
|
|
95
|
-
return prettier_builder_1.join(sep, actualElements);
|
|
99
|
+
return (0, prettier_builder_1.join)(sep, actualElements);
|
|
96
100
|
}
|
|
97
101
|
exports.rejectAndJoin = rejectAndJoin;
|
|
98
102
|
function rejectAndConcat(elems) {
|
|
99
103
|
var actualElements = reject(elems);
|
|
100
|
-
return prettier_builder_1.concat(actualElements);
|
|
104
|
+
return (0, prettier_builder_1.concat)(actualElements);
|
|
101
105
|
}
|
|
102
106
|
exports.rejectAndConcat = rejectAndConcat;
|
|
103
107
|
function sortAnnotationIdentifier(annotations, identifiers) {
|
|
104
|
-
var tokens = __spreadArray([], identifiers);
|
|
108
|
+
var tokens = __spreadArray([], identifiers, true);
|
|
105
109
|
if (annotations && annotations.length > 0) {
|
|
106
|
-
tokens = __spreadArray(__spreadArray([], tokens), annotations);
|
|
110
|
+
tokens = __spreadArray(__spreadArray([], tokens, true), annotations, true);
|
|
107
111
|
}
|
|
108
112
|
return tokens.sort(function (a, b) {
|
|
109
|
-
var startOffset1 = utils_1.isCstNode(a)
|
|
113
|
+
var startOffset1 = (0, utils_1.isCstNode)(a)
|
|
110
114
|
? a.children.At[0].startOffset
|
|
111
115
|
: a.startOffset;
|
|
112
|
-
var startOffset2 = utils_1.isCstNode(b)
|
|
116
|
+
var startOffset2 = (0, utils_1.isCstNode)(b)
|
|
113
117
|
? b.children.At[0].startOffset
|
|
114
118
|
: b.startOffset;
|
|
115
119
|
return startOffset1 - startOffset2;
|
|
@@ -118,7 +122,7 @@ function sortAnnotationIdentifier(annotations, identifiers) {
|
|
|
118
122
|
exports.sortAnnotationIdentifier = sortAnnotationIdentifier;
|
|
119
123
|
function sortTokens(values) {
|
|
120
124
|
var tokens = [];
|
|
121
|
-
forEach_1.default(values, function (argument) {
|
|
125
|
+
(0, forEach_1.default)(values, function (argument) {
|
|
122
126
|
if (argument) {
|
|
123
127
|
tokens = tokens.concat(argument);
|
|
124
128
|
}
|
|
@@ -129,7 +133,7 @@ function sortTokens(values) {
|
|
|
129
133
|
}
|
|
130
134
|
function sortNodes(values) {
|
|
131
135
|
var nodes = [];
|
|
132
|
-
forEach_1.default(values, function (argument) {
|
|
136
|
+
(0, forEach_1.default)(values, function (argument) {
|
|
133
137
|
if (argument) {
|
|
134
138
|
nodes = nodes.concat(argument);
|
|
135
139
|
}
|
|
@@ -149,23 +153,23 @@ function matchCategory(token, categoryName) {
|
|
|
149
153
|
}
|
|
150
154
|
exports.matchCategory = matchCategory;
|
|
151
155
|
function sortClassTypeChildren(annotations, typeArguments, identifiers, dots) {
|
|
152
|
-
var tokens = __spreadArray([], identifiers);
|
|
156
|
+
var tokens = __spreadArray([], identifiers, true);
|
|
153
157
|
if (annotations && annotations.length > 0) {
|
|
154
|
-
tokens = __spreadArray(__spreadArray([], tokens), annotations);
|
|
158
|
+
tokens = __spreadArray(__spreadArray([], tokens, true), annotations, true);
|
|
155
159
|
}
|
|
156
160
|
if (typeArguments && typeArguments.length > 0) {
|
|
157
|
-
tokens = __spreadArray(__spreadArray([], tokens), typeArguments);
|
|
161
|
+
tokens = __spreadArray(__spreadArray([], tokens, true), typeArguments, true);
|
|
158
162
|
}
|
|
159
163
|
if (dots && dots.length > 0) {
|
|
160
|
-
tokens = __spreadArray(__spreadArray([], tokens), dots);
|
|
164
|
+
tokens = __spreadArray(__spreadArray([], tokens, true), dots, true);
|
|
161
165
|
}
|
|
162
166
|
return tokens.sort(function (a, b) {
|
|
163
|
-
var startOffsetA = utils_1.isCstNode(a)
|
|
167
|
+
var startOffsetA = (0, utils_1.isCstNode)(a)
|
|
164
168
|
? a.children.At
|
|
165
169
|
? a.children.At[0].startOffset
|
|
166
170
|
: a.children.Less[0].startOffset
|
|
167
171
|
: a.startOffset;
|
|
168
|
-
var startOffsetB = utils_1.isCstNode(b)
|
|
172
|
+
var startOffsetB = (0, utils_1.isCstNode)(b)
|
|
169
173
|
? b.children.At
|
|
170
174
|
? b.children.At[0].startOffset
|
|
171
175
|
: b.children.Less[0].startOffset
|
|
@@ -184,7 +188,7 @@ function sortModifiers(modifiers) {
|
|
|
184
188
|
* method annotations which come after all other
|
|
185
189
|
* modifiers
|
|
186
190
|
*/
|
|
187
|
-
forEachRight_1.default(modifiers, function (modifier) {
|
|
191
|
+
(0, forEachRight_1.default)(modifiers, function (modifier) {
|
|
188
192
|
var isAnnotation = modifier.children.annotation !== undefined;
|
|
189
193
|
var isMethodAnnotation = isAnnotation &&
|
|
190
194
|
(modifier.name === "methodModifier" ||
|
|
@@ -220,7 +224,7 @@ function sortModifiers(modifiers) {
|
|
|
220
224
|
exports.sortModifiers = sortModifiers;
|
|
221
225
|
function findDeepElementInPartsArray(item, elt) {
|
|
222
226
|
if (Array.isArray(item)) {
|
|
223
|
-
if (includes_1.default(item, elt)) {
|
|
227
|
+
if ((0, includes_1.default)(item, elt)) {
|
|
224
228
|
return true;
|
|
225
229
|
}
|
|
226
230
|
for (var i = 0; i < item.length; i++) {
|
|
@@ -242,13 +246,13 @@ function findDeepElementInPartsArray(item, elt) {
|
|
|
242
246
|
exports.findDeepElementInPartsArray = findDeepElementInPartsArray;
|
|
243
247
|
function displaySemicolon(token, params) {
|
|
244
248
|
if (params !== undefined && params.allowEmptyStatement) {
|
|
245
|
-
return format_comments_1.printTokenWithComments(token);
|
|
249
|
+
return (0, format_comments_1.printTokenWithComments)(token);
|
|
246
250
|
}
|
|
247
|
-
if (!comments_utils_1.hasComments(token)) {
|
|
251
|
+
if (!(0, comments_utils_1.hasComments)(token)) {
|
|
248
252
|
return "";
|
|
249
253
|
}
|
|
250
254
|
token.image = "";
|
|
251
|
-
return format_comments_1.printTokenWithComments(token);
|
|
255
|
+
return (0, format_comments_1.printTokenWithComments)(token);
|
|
252
256
|
}
|
|
253
257
|
exports.displaySemicolon = displaySemicolon;
|
|
254
258
|
function isExplicitLambdaParameter(ctx) {
|
|
@@ -262,20 +266,20 @@ exports.isExplicitLambdaParameter = isExplicitLambdaParameter;
|
|
|
262
266
|
function getBlankLinesSeparator(ctx, separator) {
|
|
263
267
|
if (separator === void 0) { separator = hardline; }
|
|
264
268
|
if (ctx === undefined) {
|
|
265
|
-
return
|
|
269
|
+
return [];
|
|
266
270
|
}
|
|
267
271
|
var separators = [];
|
|
268
272
|
for (var i = 0; i < ctx.length - 1; i++) {
|
|
269
273
|
var node = ctx[i];
|
|
270
|
-
var previousRuleEndLineWithComment = comments_utils_1.hasTrailingComments(node)
|
|
274
|
+
var previousRuleEndLineWithComment = (0, comments_utils_1.hasTrailingComments)(node)
|
|
271
275
|
? node.trailingComments[node.trailingComments.length - 1].endLine
|
|
272
276
|
: node.location.endLine;
|
|
273
277
|
var nextNode = ctx[i + 1];
|
|
274
|
-
var nextRuleStartLineWithComment = comments_utils_1.hasLeadingComments(nextNode)
|
|
278
|
+
var nextRuleStartLineWithComment = (0, comments_utils_1.hasLeadingComments)(nextNode)
|
|
275
279
|
? nextNode.leadingComments[0].startLine
|
|
276
280
|
: nextNode.location.startLine;
|
|
277
281
|
if (nextRuleStartLineWithComment - previousRuleEndLineWithComment > 1) {
|
|
278
|
-
separators.push(
|
|
282
|
+
separators.push([hardline, hardline]);
|
|
279
283
|
}
|
|
280
284
|
else {
|
|
281
285
|
separators.push(separator);
|
|
@@ -284,6 +288,14 @@ function getBlankLinesSeparator(ctx, separator) {
|
|
|
284
288
|
return separators;
|
|
285
289
|
}
|
|
286
290
|
exports.getBlankLinesSeparator = getBlankLinesSeparator;
|
|
291
|
+
var isTwoHardLine = function (userBlankLinesSeparator) {
|
|
292
|
+
if (!Array.isArray(userBlankLinesSeparator)) {
|
|
293
|
+
return false;
|
|
294
|
+
}
|
|
295
|
+
return (userBlankLinesSeparator.length === 2 &&
|
|
296
|
+
userBlankLinesSeparator[0] === hardline &&
|
|
297
|
+
userBlankLinesSeparator[1] === hardline);
|
|
298
|
+
};
|
|
287
299
|
function getDeclarationsSeparator(declarations, needLineDeclaration, isSemicolon) {
|
|
288
300
|
var declarationsWithoutEmptyStatements = declarations.filter(function (declaration) { return !isSemicolon(declaration); });
|
|
289
301
|
var userBlankLinesSeparators = getBlankLinesSeparator(declarationsWithoutEmptyStatements);
|
|
@@ -294,22 +306,19 @@ function getDeclarationsSeparator(declarations, needLineDeclaration, isSemicolon
|
|
|
294
306
|
// if the empty statement has comments
|
|
295
307
|
// we want to print them on their own line
|
|
296
308
|
if (isSemicolon(declarations[i])) {
|
|
297
|
-
if (comments_utils_1.hasComments(declarations[i])) {
|
|
309
|
+
if ((0, comments_utils_1.hasComments)(declarations[i])) {
|
|
298
310
|
separators.push(hardline);
|
|
299
311
|
}
|
|
300
312
|
}
|
|
301
313
|
else if (indexNextNotEmptyDeclaration <
|
|
302
314
|
declarationsWithoutEmptyStatements.length - 1) {
|
|
303
|
-
var
|
|
304
|
-
|
|
305
|
-
userBlankLinesSeparators[indexNextNotEmptyDeclaration].parts[0].type ===
|
|
306
|
-
"concat";
|
|
307
|
-
var additionalSep = !isTwoHardLines &&
|
|
315
|
+
var isNextSeparatorTwoHardLine = isTwoHardLine(userBlankLinesSeparators[indexNextNotEmptyDeclaration]);
|
|
316
|
+
var additionalSep = !isNextSeparatorTwoHardLine &&
|
|
308
317
|
(additionalBlankLines[indexNextNotEmptyDeclaration + 1] ||
|
|
309
318
|
additionalBlankLines[indexNextNotEmptyDeclaration])
|
|
310
319
|
? hardline
|
|
311
320
|
: "";
|
|
312
|
-
separators.push(prettier_builder_1.concat([
|
|
321
|
+
separators.push((0, prettier_builder_1.concat)([
|
|
313
322
|
userBlankLinesSeparators[indexNextNotEmptyDeclaration],
|
|
314
323
|
additionalSep
|
|
315
324
|
]));
|
|
@@ -379,8 +388,8 @@ function hasAnnotation(modifiers) {
|
|
|
379
388
|
* @returns {boolean}
|
|
380
389
|
*/
|
|
381
390
|
function hasNonTrailingAnnotation(methodModifiers) {
|
|
382
|
-
var firstAnnotationIndex = findIndex_1.default(methodModifiers, function (modifier) { return modifier.children.annotation !== undefined; });
|
|
383
|
-
var lastNonAnnotationIndex = findLastIndex_1.default(methodModifiers, function (modifier) { return modifier.children.annotation === undefined; });
|
|
391
|
+
var firstAnnotationIndex = (0, findIndex_1.default)(methodModifiers, function (modifier) { return modifier.children.annotation !== undefined; });
|
|
392
|
+
var lastNonAnnotationIndex = (0, findLastIndex_1.default)(methodModifiers, function (modifier) { return modifier.children.annotation === undefined; });
|
|
384
393
|
return (firstAnnotationIndex < lastNonAnnotationIndex ||
|
|
385
394
|
lastNonAnnotationIndex === -1);
|
|
386
395
|
}
|
|
@@ -393,7 +402,7 @@ function getInterfaceBodyDeclarationsSeparator(interfaceMemberDeclarationContext
|
|
|
393
402
|
}
|
|
394
403
|
exports.getInterfaceBodyDeclarationsSeparator = getInterfaceBodyDeclarationsSeparator;
|
|
395
404
|
function putIntoBraces(argument, separator, LBrace, RBrace) {
|
|
396
|
-
var rightBraceLeadingComments = format_comments_1.getTokenLeadingComments(RBrace);
|
|
405
|
+
var rightBraceLeadingComments = (0, format_comments_1.getTokenLeadingComments)(RBrace);
|
|
397
406
|
var lastBreakLine =
|
|
398
407
|
// check if last element of the array is a line
|
|
399
408
|
rightBraceLeadingComments.length !== 0 &&
|
|
@@ -402,25 +411,25 @@ function putIntoBraces(argument, separator, LBrace, RBrace) {
|
|
|
402
411
|
: separator;
|
|
403
412
|
delete RBrace.leadingComments;
|
|
404
413
|
var contentInsideBraces;
|
|
405
|
-
if (
|
|
414
|
+
if ((0, utils_2.isEmptyDoc)(argument)) {
|
|
406
415
|
if (rightBraceLeadingComments.length === 0) {
|
|
407
|
-
return prettier_builder_1.concat([LBrace, RBrace]);
|
|
416
|
+
return (0, prettier_builder_1.concat)([LBrace, RBrace]);
|
|
408
417
|
}
|
|
409
|
-
contentInsideBraces = __spreadArray([separator], rightBraceLeadingComments);
|
|
418
|
+
contentInsideBraces = __spreadArray([separator], rightBraceLeadingComments, true);
|
|
410
419
|
}
|
|
411
420
|
else if (rightBraceLeadingComments.length !== 0) {
|
|
412
421
|
contentInsideBraces = __spreadArray([
|
|
413
422
|
separator,
|
|
414
423
|
argument,
|
|
415
424
|
separator
|
|
416
|
-
], rightBraceLeadingComments);
|
|
425
|
+
], rightBraceLeadingComments, true);
|
|
417
426
|
}
|
|
418
427
|
else {
|
|
419
428
|
contentInsideBraces = [separator, argument];
|
|
420
429
|
}
|
|
421
|
-
return prettier_builder_1.group(rejectAndConcat([
|
|
430
|
+
return (0, prettier_builder_1.group)(rejectAndConcat([
|
|
422
431
|
LBrace,
|
|
423
|
-
indent(prettier_builder_1.concat(contentInsideBraces)),
|
|
432
|
+
indent((0, prettier_builder_1.concat)(contentInsideBraces)),
|
|
424
433
|
lastBreakLine,
|
|
425
434
|
RBrace
|
|
426
435
|
]));
|
|
@@ -444,7 +453,7 @@ function separateTokensIntoGroups(ctx) {
|
|
|
444
453
|
var tmpGroup = [];
|
|
445
454
|
tokens.forEach(function (token) {
|
|
446
455
|
if (matchCategory(token, "'BinaryOperator'") &&
|
|
447
|
-
includes_1.default(andOrBinaryOperators, token.image)) {
|
|
456
|
+
(0, includes_1.default)(andOrBinaryOperators, token.image)) {
|
|
448
457
|
sortedBinaryOperators.push(token);
|
|
449
458
|
groupsOfOperator.push(tmpGroup);
|
|
450
459
|
tmpGroup = [];
|
|
@@ -483,9 +492,7 @@ function isShiftOperator(tokens, index) {
|
|
|
483
492
|
}
|
|
484
493
|
exports.isShiftOperator = isShiftOperator;
|
|
485
494
|
function isStatementEmptyStatement(statement) {
|
|
486
|
-
return (statement === ";" ||
|
|
487
|
-
// @ts-ignore
|
|
488
|
-
(isConcat(statement) && statement.parts[0] === ";"));
|
|
495
|
+
return (statement === ";" || (Array.isArray(statement) && statement[0] === ";"));
|
|
489
496
|
}
|
|
490
497
|
exports.isStatementEmptyStatement = isStatementEmptyStatement;
|
|
491
498
|
function sortImports(imports) {
|
|
@@ -554,8 +561,8 @@ function printArrayList(_a) {
|
|
|
554
561
|
var optionalComma;
|
|
555
562
|
if (trailingComma !== "none" && list !== "") {
|
|
556
563
|
optionalComma = extraComma
|
|
557
|
-
? prettier_builder_1.ifBreak(extraComma[0], __assign(__assign({}, extraComma[0]), { image: "" }))
|
|
558
|
-
: prettier_builder_1.ifBreak(",", "");
|
|
564
|
+
? (0, prettier_builder_1.ifBreak)(extraComma[0], __assign(__assign({}, extraComma[0]), { image: "" }))
|
|
565
|
+
: (0, prettier_builder_1.ifBreak)(",", "");
|
|
559
566
|
}
|
|
560
567
|
else {
|
|
561
568
|
optionalComma = extraComma ? __assign(__assign({}, extraComma[0]), { image: "" }) : "";
|
|
@@ -14,10 +14,14 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
18
|
-
for (var i = 0,
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
18
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
19
|
+
if (ar || !(i in from)) {
|
|
20
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
21
|
+
ar[i] = from[i];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
21
25
|
};
|
|
22
26
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
27
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -40,16 +44,16 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
40
44
|
var type = ctx.numericType
|
|
41
45
|
? this.visit(ctx.numericType)
|
|
42
46
|
: this.getSingle(ctx);
|
|
43
|
-
return printer_utils_1.rejectAndJoin(" ", [prettier_builder_1.join(" ", annotations), type]);
|
|
47
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), type]);
|
|
44
48
|
};
|
|
45
49
|
TypesValuesAndVariablesPrettierVisitor.prototype.numericType = function (ctx) {
|
|
46
50
|
return this.visitSingle(ctx);
|
|
47
51
|
};
|
|
48
52
|
TypesValuesAndVariablesPrettierVisitor.prototype.integralType = function (ctx) {
|
|
49
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
53
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
50
54
|
};
|
|
51
55
|
TypesValuesAndVariablesPrettierVisitor.prototype.floatingPointType = function (ctx) {
|
|
52
|
-
return format_comments_1.printTokenWithComments(this.getSingle(ctx));
|
|
56
|
+
return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
|
|
53
57
|
};
|
|
54
58
|
TypesValuesAndVariablesPrettierVisitor.prototype.referenceType = function (ctx) {
|
|
55
59
|
var annotations = this.mapVisit(ctx.annotation);
|
|
@@ -57,35 +61,35 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
57
61
|
? this.visit(ctx.primitiveType)
|
|
58
62
|
: this.visit(ctx.classOrInterfaceType);
|
|
59
63
|
var dims = this.visit(ctx.dims);
|
|
60
|
-
return printer_utils_1.rejectAndJoin(" ", [prettier_builder_1.join(" ", annotations), prettier_builder_1.concat([type, dims])]);
|
|
64
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), (0, prettier_builder_1.concat)([type, dims])]);
|
|
61
65
|
};
|
|
62
66
|
TypesValuesAndVariablesPrettierVisitor.prototype.classOrInterfaceType = function (ctx) {
|
|
63
67
|
return this.visitSingle(ctx);
|
|
64
68
|
};
|
|
65
69
|
TypesValuesAndVariablesPrettierVisitor.prototype.classType = function (ctx) {
|
|
66
70
|
var _this = this;
|
|
67
|
-
var tokens = printer_utils_1.sortClassTypeChildren(ctx.annotation, ctx.typeArguments, ctx.Identifier);
|
|
71
|
+
var tokens = (0, printer_utils_1.sortClassTypeChildren)(ctx.annotation, ctx.typeArguments, ctx.Identifier);
|
|
68
72
|
var segments = [];
|
|
69
73
|
var currentSegment = [];
|
|
70
|
-
forEach_1.default(tokens, function (token, i) {
|
|
71
|
-
if (utils_1.isTypeArgumentsCstNode(token)) {
|
|
74
|
+
(0, forEach_1.default)(tokens, function (token, i) {
|
|
75
|
+
if ((0, utils_1.isTypeArgumentsCstNode)(token)) {
|
|
72
76
|
currentSegment.push(_this.visit([token]));
|
|
73
|
-
segments.push(printer_utils_1.rejectAndConcat(currentSegment));
|
|
77
|
+
segments.push((0, printer_utils_1.rejectAndConcat)(currentSegment));
|
|
74
78
|
currentSegment = [];
|
|
75
79
|
}
|
|
76
|
-
else if (utils_1.isAnnotationCstNode(token)) {
|
|
77
|
-
currentSegment.push(_this.visit([token]));
|
|
80
|
+
else if ((0, utils_1.isAnnotationCstNode)(token)) {
|
|
81
|
+
currentSegment.push(_this.visit([token]), " ");
|
|
78
82
|
}
|
|
79
83
|
else {
|
|
80
84
|
currentSegment.push(token);
|
|
81
|
-
if ((i + 1 < tokens.length && !utils_1.isTypeArgumentsCstNode(tokens[i + 1])) ||
|
|
85
|
+
if ((i + 1 < tokens.length && !(0, utils_1.isTypeArgumentsCstNode)(tokens[i + 1])) ||
|
|
82
86
|
i + 1 === tokens.length) {
|
|
83
|
-
segments.push(printer_utils_1.rejectAndConcat(currentSegment));
|
|
87
|
+
segments.push((0, printer_utils_1.rejectAndConcat)(currentSegment));
|
|
84
88
|
currentSegment = [];
|
|
85
89
|
}
|
|
86
90
|
}
|
|
87
91
|
});
|
|
88
|
-
return printer_utils_1.rejectAndJoinSeps(ctx.Dot, segments);
|
|
92
|
+
return (0, printer_utils_1.rejectAndJoinSeps)(ctx.Dot, segments);
|
|
89
93
|
};
|
|
90
94
|
TypesValuesAndVariablesPrettierVisitor.prototype.interfaceType = function (ctx) {
|
|
91
95
|
return this.visitSingle(ctx);
|
|
@@ -93,45 +97,45 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
93
97
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeVariable = function (ctx) {
|
|
94
98
|
var annotations = this.mapVisit(ctx.annotation);
|
|
95
99
|
var identifier = this.getSingle(ctx);
|
|
96
|
-
return printer_utils_1.rejectAndJoin(" ", [prettier_builder_1.join(" ", annotations), identifier]);
|
|
100
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), identifier]);
|
|
97
101
|
};
|
|
98
102
|
TypesValuesAndVariablesPrettierVisitor.prototype.dims = function (ctx) {
|
|
99
103
|
var _this = this;
|
|
100
|
-
var tokens = __spreadArray([], ctx.LSquare);
|
|
104
|
+
var tokens = __spreadArray([], ctx.LSquare, true);
|
|
101
105
|
if (ctx.annotation) {
|
|
102
|
-
tokens = __spreadArray(__spreadArray([], tokens), ctx.annotation);
|
|
106
|
+
tokens = __spreadArray(__spreadArray([], tokens, true), ctx.annotation, true);
|
|
103
107
|
}
|
|
104
108
|
tokens = tokens.sort(function (a, b) {
|
|
105
|
-
var startOffset1 = utils_1.isCstNode(a)
|
|
109
|
+
var startOffset1 = (0, utils_1.isCstNode)(a)
|
|
106
110
|
? a.children.At[0].startOffset
|
|
107
111
|
: a.startOffset;
|
|
108
|
-
var startOffset2 = utils_1.isCstNode(b)
|
|
112
|
+
var startOffset2 = (0, utils_1.isCstNode)(b)
|
|
109
113
|
? b.children.At[0].startOffset
|
|
110
114
|
: b.startOffset;
|
|
111
115
|
return startOffset1 - startOffset2;
|
|
112
116
|
});
|
|
113
117
|
var segments = [];
|
|
114
118
|
var currentSegment = [];
|
|
115
|
-
forEach_1.default(tokens, function (token) {
|
|
116
|
-
if (utils_1.isCstNode(token)) {
|
|
119
|
+
(0, forEach_1.default)(tokens, function (token) {
|
|
120
|
+
if ((0, utils_1.isCstNode)(token)) {
|
|
117
121
|
currentSegment.push(_this.visit([token]));
|
|
118
122
|
}
|
|
119
123
|
else {
|
|
120
|
-
segments.push(printer_utils_1.rejectAndConcat([
|
|
121
|
-
printer_utils_1.rejectAndJoin(" ", currentSegment),
|
|
122
|
-
prettier_builder_1.concat([ctx.LSquare[0], ctx.RSquare[0]])
|
|
124
|
+
segments.push((0, printer_utils_1.rejectAndConcat)([
|
|
125
|
+
(0, printer_utils_1.rejectAndJoin)(" ", currentSegment),
|
|
126
|
+
(0, prettier_builder_1.concat)([ctx.LSquare[0], ctx.RSquare[0]])
|
|
123
127
|
]));
|
|
124
128
|
currentSegment = [];
|
|
125
129
|
}
|
|
126
130
|
});
|
|
127
|
-
return printer_utils_1.rejectAndConcat(segments);
|
|
131
|
+
return (0, printer_utils_1.rejectAndConcat)(segments);
|
|
128
132
|
};
|
|
129
133
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeParameter = function (ctx) {
|
|
130
134
|
var typeParameterModifiers = this.mapVisit(ctx.typeParameterModifier);
|
|
131
135
|
var typeIdentifier = this.visit(ctx.typeIdentifier);
|
|
132
136
|
var typeBound = this.visit(ctx.typeBound);
|
|
133
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
134
|
-
prettier_builder_1.join(" ", typeParameterModifiers),
|
|
137
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
138
|
+
(0, prettier_builder_1.join)(" ", typeParameterModifiers),
|
|
135
139
|
typeIdentifier,
|
|
136
140
|
typeBound
|
|
137
141
|
]);
|
|
@@ -142,24 +146,24 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
142
146
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeBound = function (ctx) {
|
|
143
147
|
var classOrInterfaceType = this.visit(ctx.classOrInterfaceType);
|
|
144
148
|
var additionalBound = this.mapVisit(ctx.additionalBound);
|
|
145
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
149
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
146
150
|
ctx.Extends[0],
|
|
147
151
|
classOrInterfaceType,
|
|
148
|
-
prettier_builder_1.join(" ", additionalBound)
|
|
152
|
+
(0, prettier_builder_1.join)(" ", additionalBound)
|
|
149
153
|
]);
|
|
150
154
|
};
|
|
151
155
|
TypesValuesAndVariablesPrettierVisitor.prototype.additionalBound = function (ctx) {
|
|
152
156
|
var interfaceType = this.visit(ctx.interfaceType);
|
|
153
|
-
return prettier_builder_1.join(" ", [ctx.And[0], interfaceType]);
|
|
157
|
+
return (0, prettier_builder_1.join)(" ", [ctx.And[0], interfaceType]);
|
|
154
158
|
};
|
|
155
159
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeArguments = function (ctx) {
|
|
156
160
|
var typeArgumentList = this.visit(ctx.typeArgumentList);
|
|
157
|
-
return printer_utils_1.rejectAndConcat([ctx.Less[0], typeArgumentList, ctx.Greater[0]]);
|
|
161
|
+
return (0, printer_utils_1.rejectAndConcat)([ctx.Less[0], typeArgumentList, ctx.Greater[0]]);
|
|
158
162
|
};
|
|
159
163
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeArgumentList = function (ctx) {
|
|
160
164
|
var typeArguments = this.mapVisit(ctx.typeArgument);
|
|
161
|
-
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, " "]); }) : [];
|
|
162
|
-
return printer_utils_1.rejectAndJoinSeps(commas, typeArguments);
|
|
165
|
+
var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, " "]); }) : [];
|
|
166
|
+
return (0, printer_utils_1.rejectAndJoinSeps)(commas, typeArguments);
|
|
163
167
|
};
|
|
164
168
|
TypesValuesAndVariablesPrettierVisitor.prototype.typeArgument = function (ctx) {
|
|
165
169
|
return this.visitSingle(ctx);
|
|
@@ -167,8 +171,8 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
167
171
|
TypesValuesAndVariablesPrettierVisitor.prototype.wildcard = function (ctx) {
|
|
168
172
|
var annotations = this.mapVisit(ctx.annotation);
|
|
169
173
|
var wildcardBounds = this.visit(ctx.wildcardBounds);
|
|
170
|
-
return printer_utils_1.rejectAndJoin(" ", [
|
|
171
|
-
prettier_builder_1.join(" ", annotations),
|
|
174
|
+
return (0, printer_utils_1.rejectAndJoin)(" ", [
|
|
175
|
+
(0, prettier_builder_1.join)(" ", annotations),
|
|
172
176
|
ctx.QuestionMark[0],
|
|
173
177
|
wildcardBounds
|
|
174
178
|
]);
|
|
@@ -176,7 +180,7 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
|
|
|
176
180
|
TypesValuesAndVariablesPrettierVisitor.prototype.wildcardBounds = function (ctx) {
|
|
177
181
|
var keyWord = ctx.Extends ? ctx.Extends[0] : ctx.Super[0];
|
|
178
182
|
var referenceType = this.visit(ctx.referenceType);
|
|
179
|
-
return prettier_builder_1.join(" ", [keyWord, referenceType]);
|
|
183
|
+
return (0, prettier_builder_1.join)(" ", [keyWord, referenceType]);
|
|
180
184
|
};
|
|
181
185
|
return TypesValuesAndVariablesPrettierVisitor;
|
|
182
186
|
}(base_cst_printer_1.BaseCstPrettierPrinter));
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __extends = (this && this.__extends) || (function () {
|
|
3
|
+
var extendStatics = function (d, b) {
|
|
4
|
+
extendStatics = Object.setPrototypeOf ||
|
|
5
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
+
return extendStatics(d, b);
|
|
8
|
+
};
|
|
9
|
+
return function (d, b) {
|
|
10
|
+
if (typeof b !== "function" && b !== null)
|
|
11
|
+
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
12
|
+
extendStatics(d, b);
|
|
13
|
+
function __() { this.constructor = d; }
|
|
14
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
|
+
};
|
|
16
|
+
})();
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.BaseCstPrettierPrinter = void 0;
|
|
19
|
+
var java_parser_1 = require("java-parser");
|
|
20
|
+
var format_comments_1 = require("./printers/comments/format-comments");
|
|
21
|
+
var BaseCstPrettierPrinter = /** @class */ (function (_super) {
|
|
22
|
+
__extends(BaseCstPrettierPrinter, _super);
|
|
23
|
+
function BaseCstPrettierPrinter() {
|
|
24
|
+
var _this = _super.call(this) || this;
|
|
25
|
+
_this.mapVisit = function (elements, params) {
|
|
26
|
+
if (elements === undefined) {
|
|
27
|
+
// TODO: can optimize this by returning an immutable empty array singleton.
|
|
28
|
+
return [];
|
|
29
|
+
}
|
|
30
|
+
return elements.map(function (element) { return _this.visit(element, params); });
|
|
31
|
+
};
|
|
32
|
+
_this.getSingle = function (ctx) {
|
|
33
|
+
var ctxKeys = Object.keys(ctx);
|
|
34
|
+
if (ctxKeys.length !== 1) {
|
|
35
|
+
throw Error("Expecting single key CST ctx but found: <" + ctxKeys.length + "> keys");
|
|
36
|
+
}
|
|
37
|
+
var singleElementKey = ctxKeys[0];
|
|
38
|
+
var singleElementValues = ctx[singleElementKey];
|
|
39
|
+
if ((singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) !== 1) {
|
|
40
|
+
throw Error("Expecting single item in CST ctx key but found: <" + (singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) + "> items");
|
|
41
|
+
}
|
|
42
|
+
return singleElementValues[0];
|
|
43
|
+
};
|
|
44
|
+
// @ts-ignore
|
|
45
|
+
_this.orgVisit = _this.visit;
|
|
46
|
+
_this.visit = function (ctx, inParam) {
|
|
47
|
+
if (ctx === undefined) {
|
|
48
|
+
// empty Doc
|
|
49
|
+
return "";
|
|
50
|
+
}
|
|
51
|
+
var node = Array.isArray(ctx) ? ctx[0] : ctx;
|
|
52
|
+
if (node.ignore) {
|
|
53
|
+
try {
|
|
54
|
+
var startOffset = node.leadingComments !== undefined
|
|
55
|
+
? node.leadingComments[0].startOffset
|
|
56
|
+
: node.location.startOffset;
|
|
57
|
+
var endOffset = (node.trailingComments !== undefined
|
|
58
|
+
? node.trailingComments[node.trailingComments.length - 1].endOffset
|
|
59
|
+
: node.location.endOffset);
|
|
60
|
+
return this.prettierOptions.originalText.substring(startOffset, endOffset + 1);
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
throw Error(e +
|
|
64
|
+
"\nThere might be a problem with prettier-ignore, please report an issue on https://github.com/jhipster/prettier-java/issues");
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return format_comments_1.printNodeWithComments(node, this.orgVisit.call(this, node, inParam));
|
|
68
|
+
};
|
|
69
|
+
_this.visitSingle = function (ctx, params) {
|
|
70
|
+
var singleElement = this.getSingle(ctx);
|
|
71
|
+
return this.visit(singleElement, params);
|
|
72
|
+
};
|
|
73
|
+
return _this;
|
|
74
|
+
}
|
|
75
|
+
return BaseCstPrettierPrinter;
|
|
76
|
+
}(java_parser_1.BaseJavaCstVisitor));
|
|
77
|
+
exports.BaseCstPrettierPrinter = BaseCstPrettierPrinter;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createPrettierDoc = void 0;
|
|
4
|
+
var base_cst_printer_1 = require("./base-cst-printer");
|
|
5
|
+
var arrays_1 = require("./printers/arrays");
|
|
6
|
+
var blocks_and_statements_1 = require("./printers/blocks-and-statements");
|
|
7
|
+
var classes_1 = require("./printers/classes");
|
|
8
|
+
var expressions_1 = require("./printers/expressions");
|
|
9
|
+
var interfaces_1 = require("./printers/interfaces");
|
|
10
|
+
var lexical_structure_1 = require("./printers/lexical-structure");
|
|
11
|
+
var names_1 = require("./printers/names");
|
|
12
|
+
var types_values_and_variables_1 = require("./printers/types-values-and-variables");
|
|
13
|
+
var packages_and_modules_1 = require("./printers/packages-and-modules");
|
|
14
|
+
// Mixins for the win
|
|
15
|
+
mixInMethods(arrays_1.ArraysPrettierVisitor, blocks_and_statements_1.BlocksAndStatementPrettierVisitor, classes_1.ClassesPrettierVisitor, expressions_1.ExpressionsPrettierVisitor, interfaces_1.InterfacesPrettierVisitor, lexical_structure_1.LexicalStructurePrettierVisitor, names_1.NamesPrettierVisitor, types_values_and_variables_1.TypesValuesAndVariablesPrettierVisitor, packages_and_modules_1.PackagesAndModulesPrettierVisitor);
|
|
16
|
+
function mixInMethods() {
|
|
17
|
+
var classesToMix = [];
|
|
18
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
19
|
+
classesToMix[_i] = arguments[_i];
|
|
20
|
+
}
|
|
21
|
+
classesToMix.forEach(function (from) {
|
|
22
|
+
var fromMethodsNames = Object.getOwnPropertyNames(from.prototype);
|
|
23
|
+
var fromPureMethodsName = fromMethodsNames.filter(function (methodName) { return methodName !== "constructor"; });
|
|
24
|
+
fromPureMethodsName.forEach(function (methodName) {
|
|
25
|
+
// @ts-ignore
|
|
26
|
+
base_cst_printer_1.BaseCstPrettierPrinter.prototype[methodName] = from.prototype[methodName];
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
var prettyPrinter = new base_cst_printer_1.BaseCstPrettierPrinter();
|
|
31
|
+
// TODO: do we need the "path" and "print" arguments passed by prettier
|
|
32
|
+
// see https://github.com/prettier/prettier/issues/5747
|
|
33
|
+
function createPrettierDoc(cstNode, options) {
|
|
34
|
+
prettyPrinter.prettierOptions = options;
|
|
35
|
+
return prettyPrinter.visit(cstNode);
|
|
36
|
+
}
|
|
37
|
+
exports.createPrettierDoc = createPrettierDoc;
|