prettier-plugin-java 1.6.2 → 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/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
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ifBreak = exports.dedent = exports.indent = exports.fill = exports.group = exports.join = exports.concat = void 0;
|
|
2
4
|
var prettier = require("prettier").doc.builders;
|
|
3
5
|
var processComments = require("./comments/format-comments").processComments;
|
|
4
6
|
/*
|
|
@@ -7,38 +9,45 @@ var processComments = require("./comments/format-comments").processComments;
|
|
|
7
9
|
* ------------------------------------------------------------------
|
|
8
10
|
*/
|
|
9
11
|
function concat(docs) {
|
|
10
|
-
var concatenation =
|
|
11
|
-
|
|
12
|
+
var concatenation = processComments(docs);
|
|
13
|
+
if (!Array.isArray(docs)) {
|
|
14
|
+
return "";
|
|
15
|
+
}
|
|
16
|
+
return concatenation;
|
|
12
17
|
}
|
|
18
|
+
exports.concat = concat;
|
|
13
19
|
function join(sep, docs) {
|
|
14
20
|
var concatenation = prettier.join(processComments(sep), processComments(docs));
|
|
15
|
-
return concatenation
|
|
21
|
+
return processEmptyDocs(concatenation);
|
|
16
22
|
}
|
|
23
|
+
exports.join = join;
|
|
17
24
|
function group(doc, opts) {
|
|
18
25
|
var group = prettier.group(processComments(doc), opts);
|
|
19
26
|
return group.contents === undefined ? "" : group;
|
|
20
27
|
}
|
|
28
|
+
exports.group = group;
|
|
21
29
|
function fill(docs) {
|
|
22
30
|
var fill = prettier.fill(processComments(docs));
|
|
23
|
-
return fill
|
|
31
|
+
return processEmptyDocs(fill);
|
|
24
32
|
}
|
|
33
|
+
exports.fill = fill;
|
|
25
34
|
function indent(doc) {
|
|
26
35
|
var indentedDoc = prettier.indent(processComments(doc));
|
|
27
36
|
return indentedDoc.contents.length === 0 ? "" : indentedDoc;
|
|
28
37
|
}
|
|
38
|
+
exports.indent = indent;
|
|
29
39
|
function dedent(doc) {
|
|
30
40
|
var indentedDoc = prettier.dedent(processComments(doc));
|
|
31
41
|
return indentedDoc.contents.length === 0 ? "" : indentedDoc;
|
|
32
42
|
}
|
|
43
|
+
exports.dedent = dedent;
|
|
33
44
|
function ifBreak(breakContents, flatContents) {
|
|
34
45
|
return prettier.ifBreak(processComments(breakContents), processComments(flatContents));
|
|
35
46
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
indent: indent,
|
|
42
|
-
dedent: dedent,
|
|
43
|
-
ifBreak: ifBreak
|
|
47
|
+
exports.ifBreak = ifBreak;
|
|
48
|
+
// TODO: remove this once prettier 3.0 is released
|
|
49
|
+
var processEmptyDocs = function (doc) {
|
|
50
|
+
var _a;
|
|
51
|
+
return ((_a = doc.parts) === null || _a === void 0 ? void 0 : _a.length) === 0 ? "" : doc;
|
|
44
52
|
};
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJldHRpZXItYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcmludGVycy9wcmV0dGllci1idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFlBQVksQ0FBQzs7O0FBT2IsSUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7QUFFMUMsSUFBQSxlQUFlLEdBQUssT0FBTyxDQUFDLDRCQUE0QixDQUFDLGdCQUExQyxDQUEyQztBQUVsRTs7OztHQUlHO0FBRUgsU0FBZ0IsTUFBTSxDQUFDLElBQXNCO0lBQzNDLElBQU0sYUFBYSxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUU1QyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUN4QixPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsT0FBTyxhQUFhLENBQUM7QUFDdkIsQ0FBQztBQVJELHdCQVFDO0FBRUQsU0FBZ0IsSUFBSSxDQUFDLEdBQVEsRUFBRSxJQUFzQjtJQUNuRCxJQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUNqQyxlQUFlLENBQUMsR0FBRyxDQUFDLEVBQ3BCLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FDdEIsQ0FBQztJQUVGLE9BQU8sZ0JBQWdCLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDekMsQ0FBQztBQVBELG9CQU9DO0FBRUQsU0FBZ0IsS0FBSyxDQUFDLEdBQWlCLEVBQUUsSUFBVTtJQUNqRCxJQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUN6RCxPQUFPLEtBQUssQ0FBQyxRQUFRLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztBQUNuRCxDQUFDO0FBSEQsc0JBR0M7QUFFRCxTQUFnQixJQUFJLENBQUMsSUFBc0I7SUFDekMsSUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUVsRCxPQUFPLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ2hDLENBQUM7QUFKRCxvQkFJQztBQUVELFNBQWdCLE1BQU0sQ0FBQyxHQUFpQjtJQUN0QyxJQUFNLFdBQVcsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQzFELE9BQU8sV0FBVyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQztBQUM5RCxDQUFDO0FBSEQsd0JBR0M7QUFFRCxTQUFnQixNQUFNLENBQUMsR0FBaUI7SUFDdEMsSUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUMxRCxPQUFPLFdBQVcsQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUM7QUFDOUQsQ0FBQztBQUhELHdCQUdDO0FBRUQsU0FBZ0IsT0FBTyxDQUNyQixhQUEyQixFQUMzQixZQUEwQjtJQUUxQixPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQ3JCLGVBQWUsQ0FBQyxhQUFhLENBQUMsRUFDOUIsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUM5QixDQUFDO0FBQ0osQ0FBQztBQVJELDBCQVFDO0FBRUQsa0RBQWtEO0FBQ2xELElBQU0sZ0JBQWdCLEdBQUcsVUFBQyxHQUFrQjs7SUFDMUMsT0FBTyxDQUFBLE1BQUEsR0FBRyxDQUFDLEtBQUssMENBQUUsTUFBTSxNQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7QUFDNUMsQ0FBQyxDQUFDIn0=
|
|
@@ -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: "" }) : "";
|
|
@@ -563,3 +570,4 @@ function printArrayList(_a) {
|
|
|
563
570
|
return putIntoBraces(rejectAndConcat([list, optionalComma]), line, LCurly, RCurly);
|
|
564
571
|
}
|
|
565
572
|
exports.printArrayList = printArrayList;
|
|
573
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"printer-utils.js","sourceRoot":"","sources":["../../src/printers/printer-utils.ts"],"names":[],"mappings":"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"}
|