prettier-plugin-java 2.1.0 → 2.2.0

package/dist/parser.js

@@ -1,7 +1,6 @@
 "use strict";
 var javaParser = require("java-parser");
 function parse(text, parsers, opts) {
-    var cst = javaParser.parse(text, opts.entrypoint);
-    return cst;
+    return javaParser.parse(text, opts.entrypoint);
 }
 module.exports = parse;

package/dist/printer.js

@@ -3,26 +3,6 @@ var createPrettierDoc = require("./cst-printer").createPrettierDoc;
 // eslint-disable-next-line no-unused-vars
 function genericPrint(path, options, print) {
     var node = path.getValue();
-    // console.log(node);
-    // if (node.comments) {
-    //   console.log(node.type, node.comments);
-    // }
-    // node["comments"] = [
-    //   {
-    //     ast_type: "comment",
-    //     value: "// a",
-    //     leading: false,
-    //     trailing: true,
-    //     printed: false
-    //   },
-    //   {
-    //     ast_type: "comment",
-    //     value: "// b",
-    //     leading: true,
-    //     trailing: false,
-    //     printed: false
-    //   }
-    // ];
     return createPrettierDoc(node, options);
 }
 module.exports = genericPrint;

package/dist/printers/prettier-builder.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.indentIfBreak = exports.ifBreak = exports.dedent = exports.indent = exports.fill = exports.group = exports.join = exports.concat = void 0;
-var prettier = require("prettier").doc.builders;
+var doc_1 = require("prettier/doc");
 var processComments = require("./comments/format-comments").processComments;
 /*
  * ------------------------------------------------------------------
@@ -17,40 +17,39 @@ function concat(docs) {
 }
 exports.concat = concat;
 function join(sep, docs) {
-    var concatenation = prettier.join(processComments(sep), processComments(docs));
-    return processEmptyDocs(concatenation);
+    return doc_1.builders.join(processComments(sep), processComments(docs));
 }
 exports.join = join;
-function group(doc, opts) {
-    var group = prettier.group(processComments(doc), opts);
+function group(docs, opts) {
+    var group = doc_1.builders.group(processComments(docs), opts);
     return group.contents === undefined ? "" : group;
 }
 exports.group = group;
 function fill(docs) {
-    var fill = prettier.fill(processComments(docs));
-    return processEmptyDocs(fill);
+    return doc_1.builders.fill(processComments(docs));
 }
 exports.fill = fill;
 function indent(doc) {
-    var indentedDoc = prettier.indent(processComments(doc));
-    return indentedDoc.contents.length === 0 ? "" : indentedDoc;
+    var processedDoc = processComments(doc);
+    if (processedDoc.length === 0) {
+        return "";
+    }
+    return doc_1.builders.indent(processedDoc);
 }
 exports.indent = indent;
 function dedent(doc) {
-    var indentedDoc = prettier.dedent(processComments(doc));
-    return indentedDoc.contents.length === 0 ? "" : indentedDoc;
+    var processedDoc = processComments(doc);
+    if (processedDoc.length === 0) {
+        return "";
+    }
+    return doc_1.builders.dedent(processComments(doc));
 }
 exports.dedent = dedent;
 function ifBreak(breakContents, flatContents) {
-    return prettier.ifBreak(processComments(breakContents), processComments(flatContents));
+    return doc_1.builders.ifBreak(processComments(breakContents), processComments(flatContents));
 }
 exports.ifBreak = ifBreak;
 function indentIfBreak(contents, opts) {
-    return prettier.indentIfBreak(processComments(contents), opts);
+    return doc_1.builders.indentIfBreak(processComments(contents), opts);
 }
 exports.indentIfBreak = indentIfBreak;
-// TODO: remove this once prettier 3.0 is released
-var processEmptyDocs = function (doc) {
-    var _a;
-    return ((_a = doc.parts) === null || _a === void 0 ? void 0 : _a.length) === 0 ? "" : doc;
-};

package/dist/printers/printer-utils.js

@@ -401,15 +401,23 @@ function getInterfaceBodyDeclarationsSeparator(interfaceMemberDeclarationContext
     return getDeclarationsSeparator(interfaceMemberDeclarationContext, needLineInterfaceMemberDeclaration, isInterfaceMemberASemicolon);
 }
 exports.getInterfaceBodyDeclarationsSeparator = getInterfaceBodyDeclarationsSeparator;
+function getAndRemoveLeadingComment(doc) {
+    var isTokenWithLeadingComment = typeof doc !== "string" && "leadingComments" in doc;
+    if (!isTokenWithLeadingComment) {
+        return [];
+    }
+    var leadingComments = (0, format_comments_1.getTokenLeadingComments)(doc);
+    delete doc.leadingComments;
+    return leadingComments;
+}
 function putIntoBraces(argument, separator, LBrace, RBrace) {
-    var rightBraceLeadingComments = (0, format_comments_1.getTokenLeadingComments)(RBrace);
+    var rightBraceLeadingComments = getAndRemoveLeadingComment(RBrace);
     var lastBreakLine = 
     // check if last element of the array is a line
     rightBraceLeadingComments.length !== 0 &&
         rightBraceLeadingComments[rightBraceLeadingComments.length - 1] === hardline
         ? rightBraceLeadingComments.pop()
         : separator;
-    delete RBrace.leadingComments;
     var contentInsideBraces;
     if ((0, utils_2.isEmptyDoc)(argument)) {
         if (rightBraceLeadingComments.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Prettier Java Plugin",
   "main": "dist/index.js",
   "files": [
@@ -11,7 +11,7 @@
   "dependencies": {
     "java-parser": "2.0.4",
     "lodash": "4.17.21",
-    "prettier": "2.8.4"
+    "prettier": "3.0.0"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -37,10 +37,9 @@
     "@types/klaw-sync": "6.0.1",
     "@types/lodash": "4.14.190",
     "@types/node": "18.11.9",
-    "@types/prettier": "2.7.1",
     "@types/sinon": "10.0.13",
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "28084f4c2c6b53784c5853fc51865dc8c7b083f9"
+  "gitHead": "f93d55a4b4764c8ff289602f91716e686f112b50"
 }