prettier-plugin-java 2.4.0 → 2.6.0

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

@@ -1,29 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasComments = exports.hasTrailingLineComments = exports.hasLeadingLineComments = exports.hasTrailingComments = exports.hasLeadingComments = void 0;
-function hasLeadingComments(token) {
+export function hasLeadingComments(token) {
     return token.leadingComments !== undefined;
 }
-exports.hasLeadingComments = hasLeadingComments;
-function hasTrailingComments(token) {
+export function hasTrailingComments(token) {
     return token.trailingComments !== undefined;
 }
-exports.hasTrailingComments = hasTrailingComments;
-function hasLeadingLineComments(token) {
+export function hasLeadingLineComments(token) {
     return (token.leadingComments !== undefined &&
         token.leadingComments.length !== 0 &&
         token.leadingComments[token.leadingComments.length - 1].tokenType.name ===
             "LineComment");
 }
-exports.hasLeadingLineComments = hasLeadingLineComments;
-function hasTrailingLineComments(token) {
+export function hasTrailingLineComments(token) {
     return (token.trailingComments !== undefined &&
         token.trailingComments.length !== 0 &&
         token.trailingComments[token.trailingComments.length - 1].tokenType.name ===
             "LineComment");
 }
-exports.hasTrailingLineComments = hasTrailingLineComments;
-function hasComments(token) {
+export function hasComments(token) {
     return hasLeadingComments(token) || hasTrailingComments(token);
 }
-exports.hasComments = hasComments;

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

@@ -1,22 +1,8 @@
-"use strict";
-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 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;
+import { builders } from "prettier/doc";
+import { isCstElementOrUndefinedIToken } from "../../types/utils.js";
+import { doc } from "prettier";
+import isEmptyDoc from "../../utils/isEmptyDoc.js";
+const { hardline, lineSuffix, breakParent, literalline } = builders;
 /**
  * Takes a token and return a doc with:
  * - concatenated leading comments
@@ -26,10 +12,11 @@ var hardline = doc_1.builders.hardline, lineSuffix = doc_1.builders.lineSuffix,
  * @param {IToken} token
  * @return a doc with the token and its comments
  */
-function printTokenWithComments(token) {
-    return printWithComments(token, token.image, getTokenLeadingComments, getTokenTrailingComments);
+export function printTokenWithComments(token) {
+    return printWithComments(token, token.image.includes("\n")
+        ? doc.utils.replaceEndOfLine(token.image)
+        : token.image, getTokenLeadingComments, getTokenTrailingComments);
 }
-exports.printTokenWithComments = printTokenWithComments;
 /**
  * Takes a node and return a doc with:
  * - concatenated leading comments
@@ -40,25 +27,23 @@ exports.printTokenWithComments = printTokenWithComments;
  * @param {Doc} value - the converted node value
  * @return a doc with the token and its comments
  */
-function printNodeWithComments(node, value) {
+export function printNodeWithComments(node, value) {
     return printWithComments(node, value, getNodeLeadingComments, getNodeTrailingComments);
 }
-exports.printNodeWithComments = printNodeWithComments;
 function printWithComments(nodeOrToken, value, getLeadingComments, getTrailingComments) {
-    var leadingComments = getLeadingComments(nodeOrToken);
-    var trailingComments = getTrailingComments(nodeOrToken, value);
+    const leadingComments = getLeadingComments(nodeOrToken);
+    const trailingComments = getTrailingComments(nodeOrToken, value);
     return leadingComments.length === 0 && trailingComments.length === 0
         ? value
-        : __spreadArray(__spreadArray(__spreadArray([], leadingComments, true), [value], false), trailingComments, true);
+        : [...leadingComments, value, ...trailingComments];
 }
 /**
  * @param {IToken} token
  * @return an array containing processed leading comments and separators
  */
-function getTokenLeadingComments(token) {
+export function getTokenLeadingComments(token) {
     return getLeadingComments(token, token);
 }
-exports.getTokenLeadingComments = getTokenLeadingComments;
 /**
  * @param {CstNode} node
  * @return an array containing processed leading comments and separators
@@ -67,12 +52,12 @@ function getNodeLeadingComments(node) {
     return getLeadingComments(node, node.location);
 }
 function getLeadingComments(nodeOrToken, location) {
-    var arr = [];
+    const arr = [];
     if (nodeOrToken.leadingComments !== undefined) {
-        var previousEndLine = nodeOrToken.leadingComments[0].endLine;
-        var step = void 0;
+        let previousEndLine = nodeOrToken.leadingComments[0].endLine;
+        let step;
         arr.push(formatComment(nodeOrToken.leadingComments[0]));
-        for (var i = 1; i < nodeOrToken.leadingComments.length; i++) {
+        for (let i = 1; i < nodeOrToken.leadingComments.length; i++) {
             step = nodeOrToken.leadingComments[i].startLine - previousEndLine;
             if (step === 1 ||
                 nodeOrToken.leadingComments[i].startOffset > location.startOffset) {
@@ -112,15 +97,15 @@ function getNodeTrailingComments(node, value) {
     return getTrailingComments(node, value, node.location);
 }
 function getTrailingComments(nodeOrToken, value, location) {
-    var arr = [];
-    var previousEndLine = location.endLine;
+    const arr = [];
+    let previousEndLine = location.endLine;
     if (nodeOrToken.trailingComments !== undefined) {
-        nodeOrToken.trailingComments.forEach(function (comment, idx) {
-            var separator = "";
+        nodeOrToken.trailingComments.forEach((comment, idx) => {
+            let separator = "";
             if (comment.startLine !== previousEndLine) {
                 arr.push(hardline);
             }
-            else if (!(0, isEmptyDoc_1.default)(value) && idx === 0) {
+            else if (!isEmptyDoc(value) && idx === 0) {
                 separator = " ";
             }
             if (comment.tokenType.name === "LineComment") {
@@ -135,9 +120,9 @@ function getTrailingComments(nodeOrToken, value, location) {
     return arr;
 }
 function isJavaDoc(comment, lines) {
-    var isJavaDoc = true;
+    let isJavaDoc = true;
     if (comment.tokenType.name === "TraditionalComment" && lines.length > 1) {
-        for (var i = 1; i < lines.length; i++) {
+        for (let i = 1; i < lines.length; i++) {
             if (lines[i].trim().charAt(0) !== "*") {
                 isJavaDoc = false;
                 break;
@@ -150,38 +135,37 @@ function isJavaDoc(comment, lines) {
     return isJavaDoc;
 }
 function formatJavaDoc(lines) {
-    var res = [lines[0].trim()];
-    for (var i = 1; i < lines.length; i++) {
+    const res = [lines[0].trim()];
+    for (let i = 1; i < lines.length; i++) {
         res.push(hardline);
         res.push(" " + lines[i].trim());
     }
     return res;
 }
 function formatComment(comment) {
-    var res = [];
-    var lines = comment.image.split("\n");
+    const res = [];
+    const lines = comment.image.split("\n");
     if (isJavaDoc(comment, lines)) {
         return formatJavaDoc(lines);
     }
-    lines.forEach(function (line) {
+    lines.forEach(line => {
         res.push(line);
         res.push(literalline);
     });
     res.pop();
     return res;
 }
-function processComments(docs) {
+export function processComments(docs) {
     if (!Array.isArray(docs)) {
-        if ((0, utils_1.isCstElementOrUndefinedIToken)(docs)) {
+        if (isCstElementOrUndefinedIToken(docs)) {
             return printTokenWithComments(docs);
         }
         return docs;
     }
-    return docs.map(function (elt) {
-        if ((0, utils_1.isCstElementOrUndefinedIToken)(elt)) {
+    return docs.map(elt => {
+        if (isCstElementOrUndefinedIToken(elt)) {
             return printTokenWithComments(elt);
         }
         return elt;
     });
 }
-exports.processComments = processComments;

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

@@ -1,29 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCommentsBinaryExpression = void 0;
-var comments_utils_1 = require("./comments-utils");
-function handleCommentsBinaryExpression(ctx) {
+import { hasLeadingComments, hasTrailingComments } from "./comments-utils.js";
+export function handleCommentsBinaryExpression(ctx) {
     moveOperatorLeadingCommentsToNextExpression(ctx);
     moveExpressionTrailingCommentsToNextOperator(ctx);
 }
-exports.handleCommentsBinaryExpression = handleCommentsBinaryExpression;
 function moveOperatorLeadingCommentsToNextExpression(ctx) {
     var _a;
-    var unaryExpressionIndex = 1;
-    (_a = ctx.BinaryOperator) === null || _a === void 0 ? void 0 : _a.forEach(function (binaryOperator) {
-        var _a;
-        if ((0, comments_utils_1.hasLeadingComments)(binaryOperator)) {
+    let unaryExpressionIndex = 1;
+    (_a = ctx.BinaryOperator) === null || _a === void 0 ? void 0 : _a.forEach(binaryOperator => {
+        if (hasLeadingComments(binaryOperator)) {
             while (ctx.unaryExpression[unaryExpressionIndex].location.startOffset <
                 binaryOperator.endOffset) {
                 unaryExpressionIndex++;
             }
             // Adapt the position of the operator and its leading comments
-            var shiftUp = binaryOperator.leadingComments[0].startLine -
+            const shiftUp = binaryOperator.leadingComments[0].startLine -
                 1 -
                 binaryOperator.startLine;
             if (binaryOperator.startLine !==
                 ctx.unaryExpression[unaryExpressionIndex].location.startLine) {
-                binaryOperator.leadingComments.forEach(function (comment) {
+                binaryOperator.leadingComments.forEach(comment => {
                     comment.startLine += 1;
                     comment.endLine += 1;
                 });
@@ -34,32 +29,31 @@ function moveOperatorLeadingCommentsToNextExpression(ctx) {
             // unaryExpression
             ctx.unaryExpression[unaryExpressionIndex].leadingComments =
                 ctx.unaryExpression[unaryExpressionIndex].leadingComments || [];
-            (_a = ctx.unaryExpression[unaryExpressionIndex].leadingComments).unshift.apply(_a, binaryOperator.leadingComments);
+            ctx.unaryExpression[unaryExpressionIndex].leadingComments.unshift(...binaryOperator.leadingComments);
             delete binaryOperator.leadingComments;
         }
     });
 }
 function moveExpressionTrailingCommentsToNextOperator(ctx) {
-    var binaryOperators = ctx.BinaryOperator;
-    var binaryOperatorIndex = 1;
+    const binaryOperators = ctx.BinaryOperator;
+    let binaryOperatorIndex = 1;
     if (binaryOperators === null || binaryOperators === void 0 ? void 0 : binaryOperators.length) {
-        ctx.unaryExpression.forEach(function (unaryExpression) {
+        ctx.unaryExpression.forEach(unaryExpression => {
             var _a;
-            var _b;
-            if ((0, comments_utils_1.hasTrailingComments)(unaryExpression)) {
+            if (hasTrailingComments(unaryExpression)) {
                 while (binaryOperatorIndex < binaryOperators.length &&
                     unaryExpression.location.endOffset &&
                     binaryOperators[binaryOperatorIndex].startOffset <
                         unaryExpression.location.endOffset) {
                     binaryOperatorIndex++;
                 }
-                var binaryOperator = binaryOperators[binaryOperatorIndex];
+                const binaryOperator = binaryOperators[binaryOperatorIndex];
                 // Adapt the position of the expression and its trailing comments
-                var shiftUp = unaryExpression.trailingComments[0].startLine -
+                const shiftUp = unaryExpression.trailingComments[0].startLine -
                     1 -
                     unaryExpression.location.startLine;
                 if (unaryExpression.location.startLine !== binaryOperator.startLine) {
-                    unaryExpression.trailingComments.forEach(function (comment) {
+                    unaryExpression.trailingComments.forEach(comment => {
                         comment.startLine += 1;
                         comment.endLine += 1;
                     });
@@ -70,8 +64,8 @@ function moveExpressionTrailingCommentsToNextOperator(ctx) {
                 }
                 // Move unaryExpression's trailing comments to the following
                 // binaryOperator
-                binaryOperator.trailingComments = (_b = binaryOperator.trailingComments) !== null && _b !== void 0 ? _b : [];
-                (_a = binaryOperator.trailingComments).unshift.apply(_a, unaryExpression.trailingComments);
+                binaryOperator.trailingComments = (_a = binaryOperator.trailingComments) !== null && _a !== void 0 ? _a : [];
+                binaryOperator.trailingComments.unshift(...unaryExpression.trailingComments);
                 delete unaryExpression.trailingComments;
             }
         });