prettier-plugin-java 2.7.3 → 2.7.4

package/dist/printers/blocks-and-statements.d.ts

@@ -104,7 +104,7 @@ declare const _default: {
     }>, print: import("./helpers.js").JavaPrintFn): builders.Doc[];
     resourceSpecification(path: import("prettier").AstPath<import("java-parser").ResourceSpecificationCstNode & {
         comments?: import("../comments.js").JavaComment[];
-    }>, print: import("./helpers.js").JavaPrintFn, options: import("./helpers.js").JavaParserOptions): builders.Group | "()";
+    }>, print: import("./helpers.js").JavaPrintFn): builders.Group | "()";
     resourceList(path: import("prettier").AstPath<import("java-parser").ResourceListCstNode & {
         comments?: import("../comments.js").JavaComment[];
     }>, print: import("./helpers.js").JavaPrintFn): builders.Doc[];

package/dist/printers/blocks-and-statements.js

@@ -318,9 +318,9 @@ export default {
         }
         return join(" ", blocks);
     },
-    resourceSpecification(path, print, options) {
+    resourceSpecification(path, print) {
         const resources = [call(path, print, "resourceList")];
-        if (options.trailingComma !== "none") {
+        if (path.node.children.Semicolon) {
             resources.push(ifBreak(";"));
         }
         return indentInParentheses(resources);

package/dist/printers/helpers.d.ts

@@ -30,7 +30,7 @@ export declare function printList<T extends JavaNonTerminal, P extends IterPrope
 export declare function printClassPermits(path: AstPath<ClassPermitsCstNode | InterfacePermitsCstNode>, print: JavaPrintFn): builders.Group;
 export declare function printClassType(path: AstPath<JavaNonTerminal & {
     children: ClassTypeCtx;
-}>, print: JavaPrintFn): builders.Doc[][];
+}>, print: JavaPrintFn): builders.Doc[];
 export declare function isBinaryExpression(expression: ExpressionCstNode): boolean;
 export declare function findBaseIndent(lines: string[]): number;
 export declare function isEmptyStatement(statement: StatementCstNode): boolean;

package/dist/printers/helpers.js

@@ -181,23 +181,29 @@ export function printClassPermits(path, print) {
     ]);
 }
 export function printClassType(path, print) {
-    return flatMap(path, childPath => {
-        const { node, isLast } = childPath;
-        const child = [print(childPath)];
-        if (isTerminal(node)) {
-            if (!isLast) {
-                child.push(".");
+    const { children } = path.node;
+    return definedKeys(children, ["annotation", "Identifier", "typeArguments"])
+        .flatMap(child => children[child].map((node, index) => ({
+        child,
+        index,
+        startOffset: parser.locStart(node)
+    })))
+        .sort((a, b) => a.startOffset - b.startOffset)
+        .flatMap(({ child, index: childIndex }, index, array) => {
+        const node = children[child][childIndex];
+        const next = array.at(index + 1);
+        const nextNode = next && children[next.child][next.index];
+        const docs = [call(path, print, child, childIndex)];
+        if (nextNode) {
+            if (isNonTerminal(node)) {
+                docs.push(node.name === "annotation" ? " " : ".");
+            }
+            else if (isTerminal(nextNode) || nextNode.name === "annotation") {
+                docs.push(".");
             }
         }
-        else if (node.name === "annotation") {
-            child.push(" ");
-        }
-        return child;
-    }, definedKeys(path.node.children, [
-        "annotation",
-        "Identifier",
-        "typeArguments"
-    ]));
+        return docs;
+    });
 }
 export function isBinaryExpression(expression) {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Prettier Java Plugin",
   "type": "module",
   "exports": {
@@ -41,5 +41,5 @@
   "peerDependencies": {
     "prettier": "^3.0.0"
   },
-  "gitHead": "ec18b2fe1bcecd353d32cdcba7483cd0f88cb8a2"
+  "gitHead": "306a608c6ff6aee2010120ffb47a8c8a13fe7ef1"
 }