prettier-plugin-java 1.6.2 → 2.0.0

package/dist/printers/comments/comments-utils.js

@@ -27,3 +27,4 @@ function hasComments(token) {
     return hasLeadingComments(token) || hasTrailingComments(token);
 }
 exports.hasComments = hasComments;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWVudHMtdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHJpbnRlcnMvY29tbWVudHMvY29tbWVudHMtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsU0FBZ0Isa0JBQWtCLENBQ2hDLEtBQWlCO0lBRWpCLE9BQU8sS0FBSyxDQUFDLGVBQWUsS0FBSyxTQUFTLENBQUM7QUFDN0MsQ0FBQztBQUpELGdEQUlDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQ2pDLEtBQWlCO0lBRWpCLE9BQU8sS0FBSyxDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQztBQUM5QyxDQUFDO0FBSkQsa0RBSUM7QUFFRCxTQUFnQixzQkFBc0IsQ0FDcEMsS0FBaUI7SUFFakIsT0FBTyxDQUNMLEtBQUssQ0FBQyxlQUFlLEtBQUssU0FBUztRQUNuQyxLQUFLLENBQUMsZUFBZSxDQUFDLE1BQU0sS0FBSyxDQUFDO1FBQ2xDLEtBQUssQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLElBQUk7WUFDcEUsYUFBYSxDQUNoQixDQUFDO0FBQ0osQ0FBQztBQVRELHdEQVNDO0FBRUQsU0FBZ0IsdUJBQXVCLENBQ3JDLEtBQWlCO0lBRWpCLE9BQU8sQ0FDTCxLQUFLLENBQUMsZ0JBQWdCLEtBQUssU0FBUztRQUNwQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxLQUFLLENBQUM7UUFDbkMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLElBQUk7WUFDdEUsYUFBYSxDQUNoQixDQUFDO0FBQ0osQ0FBQztBQVRELDBEQVNDO0FBRUQsU0FBZ0IsV0FBVyxDQUFDLEtBQWlCO0lBQzNDLE9BQU8sa0JBQWtCLENBQUMsS0FBSyxDQUFDLElBQUksbUJBQW1CLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDakUsQ0FBQztBQUZELGtDQUVDIn0=

package/dist/printers/comments/format-comments.js

@@ -1,14 +1,22 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processComments = exports.getTokenLeadingComments = exports.printNodeWithComments = exports.printTokenWithComments = void 0;
 var doc_1 = require("prettier/doc");
 var utils_1 = require("../../types/utils");
-var concat = doc_1.builders.concat, hardline = doc_1.builders.hardline, lineSuffix = doc_1.builders.lineSuffix, breakParent = doc_1.builders.breakParent, literalline = doc_1.builders.literalline;
+var isEmptyDoc_1 = __importDefault(require("../../utils/isEmptyDoc"));
+var hardline = doc_1.builders.hardline, lineSuffix = doc_1.builders.lineSuffix, breakParent = doc_1.builders.breakParent, literalline = doc_1.builders.literalline;
 /**
  * Takes a token and return a doc with:
  * - concatenated leading comments
@@ -41,7 +49,7 @@ function printWithComments(nodeOrToken, value, getLeadingComments, getTrailingCo
     var trailingComments = getTrailingComments(nodeOrToken, value);
     return leadingComments.length === 0 && trailingComments.length === 0
         ? value
-        : concat(__spreadArray(__spreadArray(__spreadArray([], leadingComments), [value]), trailingComments));
+        : __spreadArray(__spreadArray(__spreadArray([], leadingComments, true), [value], false), trailingComments, true);
 }
 /**
  * @param {IToken} token
@@ -63,7 +71,7 @@ function getLeadingComments(nodeOrToken, location) {
     if (nodeOrToken.leadingComments !== undefined) {
         var previousEndLine = nodeOrToken.leadingComments[0].endLine;
         var step = void 0;
-        arr.push(concat(formatComment(nodeOrToken.leadingComments[0])));
+        arr.push(formatComment(nodeOrToken.leadingComments[0]));
         for (var i = 1; i < nodeOrToken.leadingComments.length; i++) {
             step = nodeOrToken.leadingComments[i].startLine - previousEndLine;
             if (step === 1 ||
@@ -73,7 +81,7 @@ function getLeadingComments(nodeOrToken, location) {
             else if (step > 1) {
                 arr.push(hardline, hardline);
             }
-            arr.push(concat(formatComment(nodeOrToken.leadingComments[i])));
+            arr.push(formatComment(nodeOrToken.leadingComments[i]));
             previousEndLine = nodeOrToken.leadingComments[i].endLine;
         }
         step = location.startLine - previousEndLine;
@@ -112,14 +120,14 @@ function getTrailingComments(nodeOrToken, value, location) {
             if (comment.startLine !== previousEndLine) {
                 arr.push(hardline);
             }
-            else if (value !== "" && idx === 0) {
+            else if (!(0, isEmptyDoc_1.default)(value) && idx === 0) {
                 separator = " ";
             }
             if (comment.tokenType.name === "LineComment") {
-                arr.push(lineSuffix(concat([separator, concat(formatComment(comment)), breakParent])));
+                arr.push(lineSuffix([separator, formatComment(comment), breakParent]));
             }
             else {
-                arr.push(concat(formatComment(comment)));
+                arr.push(formatComment(comment));
             }
             previousEndLine = comment.endLine;
         });
@@ -164,16 +172,17 @@ function formatComment(comment) {
 }
 function processComments(docs) {
     if (!Array.isArray(docs)) {
-        if (utils_1.isCstElementOrUndefinedIToken(docs)) {
+        if ((0, utils_1.isCstElementOrUndefinedIToken)(docs)) {
             return printTokenWithComments(docs);
         }
         return docs;
     }
     return docs.map(function (elt) {
-        if (utils_1.isCstElementOrUndefinedIToken(elt)) {
+        if ((0, utils_1.isCstElementOrUndefinedIToken)(elt)) {
             return printTokenWithComments(elt);
         }
         return elt;
     });
 }
 exports.processComments = processComments;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0LWNvbW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaW50ZXJzL2NvbW1lbnRzL2Zvcm1hdC1jb21tZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvQ0FBd0M7QUFHeEMsMkNBQWtFO0FBRWxFLHNFQUFnRDtBQUV4QyxJQUFBLFFBQVEsR0FBMkMsY0FBUSxTQUFuRCxFQUFFLFVBQVUsR0FBK0IsY0FBUSxXQUF2QyxFQUFFLFdBQVcsR0FBa0IsY0FBUSxZQUExQixFQUFFLFdBQVcsR0FBSyxjQUFRLFlBQWIsQ0FBYztBQUVwRTs7Ozs7Ozs7R0FRRztBQUNILFNBQWdCLHNCQUFzQixDQUFDLEtBQWE7SUFDbEQsT0FBTyxpQkFBaUIsQ0FDdEIsS0FBSyxFQUNMLEtBQUssQ0FBQyxLQUFLLEVBQ1gsdUJBQXVCLEVBQ3ZCLHdCQUF3QixDQUN6QixDQUFDO0FBQ0osQ0FBQztBQVBELHdEQU9DO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsU0FBZ0IscUJBQXFCLENBQUMsSUFBYSxFQUFFLEtBQVU7SUFDN0QsT0FBTyxpQkFBaUIsQ0FDdEIsSUFBSSxFQUNKLEtBQUssRUFDTCxzQkFBc0IsRUFDdEIsdUJBQXVCLENBQ3hCLENBQUM7QUFDSixDQUFDO0FBUEQsc0RBT0M7QUFFRCxTQUFTLGlCQUFpQixDQUN4QixXQUFjLEVBQ2QsS0FBVSxFQUNWLGtCQUF1QyxFQUN2QyxtQkFBb0Q7SUFFcEQsSUFBTSxlQUFlLEdBQUcsa0JBQWtCLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDeEQsSUFBTSxnQkFBZ0IsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFakUsT0FBTyxlQUFlLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEtBQUssQ0FBQztRQUNsRSxDQUFDLENBQUMsS0FBSztRQUNQLENBQUMsK0NBQUssZUFBZSxV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

package/dist/printers/comments/handle-comments.js

@@ -7,7 +7,7 @@ function handleCommentsBinaryExpression(ctx) {
     if (ctx.BinaryOperator !== undefined) {
         ctx.BinaryOperator.forEach(function (binaryOperator) {
             var _a;
-            if (comments_utils_1.hasLeadingComments(binaryOperator)) {
+            if ((0, comments_utils_1.hasLeadingComments)(binaryOperator)) {
                 while (ctx.unaryExpression[unaryExpressionIndex].location.startOffset <
                     binaryOperator.endOffset) {
                     unaryExpressionIndex++;
@@ -36,3 +36,4 @@ function handleCommentsBinaryExpression(ctx) {
     }
 }
 exports.handleCommentsBinaryExpression = handleCommentsBinaryExpression;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlLWNvbW1lbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaW50ZXJzL2NvbW1lbnRzL2hhbmRsZS1jb21tZW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBc0Q7QUFHdEQsU0FBZ0IsOEJBQThCLENBQUMsR0FBd0I7SUFDckUsSUFBSSxvQkFBb0IsR0FBRyxDQUFDLENBQUM7SUFDN0IsSUFBSSxHQUFHLENBQUMsY0FBYyxLQUFLLFNBQVMsRUFBRTtRQUNwQyxHQUFHLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxVQUFBLGNBQWM7O1lBQ3ZDLElBQUksSUFBQSxtQ0FBa0IsRUFBQyxjQUFjLENBQUMsRUFBRTtnQkFDdEMsT0FDRSxHQUFHLENBQUMsZUFBZSxDQUFDLG9CQUFvQixDQUFDLENBQUMsUUFBUSxDQUFDLFdBQVc7b0JBQzlELGNBQWMsQ0FBQyxTQUFTLEVBQ3hCO29CQUNBLG9CQUFvQixFQUFFLENBQUM7aUJBQ3hCO2dCQUVELDhEQUE4RDtnQkFDOUQsSUFBTSxPQUFPLEdBQ1gsY0FBYyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO29CQUMzQyxDQUFDO29CQUNELGNBQWMsQ0FBQyxTQUFTLENBQUM7Z0JBRTNCLElBQ0UsY0FBYyxDQUFDLFNBQVM7b0JBQ3hCLEdBQUcsQ0FBQyxlQUFlLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUM1RDtvQkFDQSxjQUFjLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxVQUFBLE9BQU87d0JBQzVDLE9BQU8sQ0FBQyxTQUFTLElBQUksQ0FBQyxDQUFDO3dCQUN2QixPQUFPLENBQUMsT0FBTyxJQUFJLENBQUMsQ0FBQztvQkFDdkIsQ0FBQyxDQUFDLENBQUM7aUJBQ0o7Z0JBQ0QsY0FBYyxDQUFDLFNBQVMsSUFBSSxPQUFPLENBQUM7Z0JBQ3BDLGNBQWMsQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDO2dCQUVsQyx3RUFBd0U7Z0JBQ3hFLHVEQUF1RDtnQkFDdkQsR0FBRyxDQUFDLGVBQWUsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLGVBQWU7b0JBQ3ZELEdBQUcsQ0FBQyxlQUFlLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxlQUFlLElBQUksRUFBRSxDQUFDO2dCQUNsRSxDQUFBLEtBQUEsR0FBRyxDQUFDLGVBQWUsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLGVBQWdCLENBQUEsQ0FBQyxPQUFPLFdBQzdELGNBQWMsQ0FBQyxlQUFlLEVBQ2pDO2dCQUNGLE9BQVEsY0FBeUIsQ0FBQyxlQUFlLENBQUM7YUFDbkQ7UUFDSCxDQUFDLENBQUMsQ0FBQztLQUNKO0FBQ0gsQ0FBQztBQXpDRCx3RUF5Q0MifQ==