prettier-plugin-java 2.6.7 → 2.6.8

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.
@@ -706,7 +706,4 @@ export class ClassesPrettierVisitor extends BaseCstPrettierPrinter {
706
706
  isDims() {
707
707
  return "isDims";
708
708
  }
709
- isFollowingVariableDeclarator() {
710
- return "isFollowingVariableDeclarator";
711
- }
712
709
  }
@@ -26,7 +26,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
26
26
  ctx.Arrow[0],
27
27
  ...(isLambdaBodyABlock
28
28
  ? [" ", lambdaBody]
29
- : [group(indent([line, lambdaBody]))])
29
+ : [group([indent([line, lambdaBody]), (params === null || params === void 0 ? void 0 : params.hug) ? softline : ""])])
30
30
  ];
31
31
  if (params === null || params === void 0 ? void 0 : params.hug) {
32
32
  return willBreak(lambdaParameters)
@@ -392,7 +392,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
392
392
  return printArgumentListWithBraces.call(this, ctx.argumentList, ctx.RBrace[0], ctx.LBrace[0]);
393
393
  }
394
394
  argumentList(ctx) {
395
- var _a, _b;
395
+ var _a;
396
396
  const headArgs = this.mapVisit(ctx.expression.slice(0, -1)).map((expression, index) => concat([expression, ctx.Comma[index], line]));
397
397
  const lastExpression = ctx.expression.at(-1);
398
398
  const lastArg = this.visit(lastExpression);
@@ -407,13 +407,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
407
407
  shouldBreak: true
408
408
  });
409
409
  }
410
- const suffix = ((_b = lastExpression === null || lastExpression === void 0 ? void 0 : lastExpression.children.lambdaExpression) === null || _b === void 0 ? void 0 : _b[0].children.lambdaBody[0].children.block)
411
- ? ""
412
- : line;
413
- const hugged = [
414
- ...headArgs,
415
- group([huggedLastArg, suffix], { shouldBreak: true })
416
- ];
410
+ const hugged = [...headArgs, group(huggedLastArg, { shouldBreak: true })];
417
411
  const expanded = group([indent([line, ...headArgs, lastArg]), line], {
418
412
  shouldBreak: true
419
413
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prettier-plugin-java",
3
- "version": "2.6.7",
3
+ "version": "2.6.8",
4
4
  "description": "Prettier Java Plugin",
5
5
  "type": "module",
6
6
  "exports": {
@@ -15,7 +15,7 @@
15
15
  "repository": "https://github.com/jhipster/prettier-java",
16
16
  "license": "Apache-2.0",
17
17
  "dependencies": {
18
- "java-parser": "2.3.3",
18
+ "java-parser": "2.3.4",
19
19
  "lodash": "4.17.21"
20
20
  },
21
21
  "scripts": {
@@ -44,5 +44,5 @@
44
44
  "peerDependencies": {
45
45
  "prettier": "^3.0.0"
46
46
  },
47
- "gitHead": "79c4d9f960374cf7a2c67fff83efb6e605c41163"
47
+ "gitHead": "a1b05b474a157165133bff7a86c1d2b88bbfa5b4"
48
48
  }
@@ -1,25 +0,0 @@
1
- export function isArgumentListSingleLambda(argumentList) {
2
- if (argumentList === undefined) {
3
- return false;
4
- }
5
- const args = argumentList[0].children.expression;
6
- if (args.length !== 1) {
7
- return false;
8
- }
9
- const argument = args[0];
10
- return argument.children.lambdaExpression !== undefined;
11
- }
12
- export const isSingleArgumentLambdaExpressionWithBlock = (argumentList) => {
13
- if (argumentList === undefined) {
14
- return false;
15
- }
16
- const args = argumentList[0].children.expression;
17
- if (args.length !== 1) {
18
- return false;
19
- }
20
- const argument = args[0];
21
- return (argument.children.lambdaExpression !== undefined &&
22
- argument.children.lambdaExpression[0].children.lambdaBody[0].children
23
- .block !== undefined);
24
- };
25
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzc2lvbnMtdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZXhwcmVzc2lvbnMtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxVQUFVLDBCQUEwQixDQUN4QyxZQUErQztJQUUvQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7UUFDOUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2pELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6QixPQUFPLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDO0FBQzFELENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSx5Q0FBeUMsR0FBRyxDQUN2RCxZQUErQyxFQUMvQyxFQUFFO0lBQ0YsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLElBQUksR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNqRCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3JCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekIsT0FBTyxDQUNMLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUztRQUNoRCxRQUFRLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUTthQUNsRSxLQUFLLEtBQUssU0FBUyxDQUN2QixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
@@ -1,18 +0,0 @@
1
- import { builders } from "prettier/doc";
2
- import { isSingleArgumentLambdaExpressionWithBlock } from "./expressions-utils.js";
3
- import { printTokenWithComments } from "../printers/comments/format-comments.js";
4
- import { concat, dedent, indent } from "../printers/prettier-builder.js";
5
- import { putIntoBraces } from "../printers/printer-utils.js";
6
- const { softline, ifBreak } = builders;
7
- export default function printSingleLambdaInvocation(argumentListCtx, rBrace, lBrace) {
8
- const lambdaParametersGroupId = Symbol("lambdaParameters");
9
- const argumentList = this.visit(argumentListCtx, {
10
- lambdaParametersGroupId,
11
- isInsideMethodInvocationSuffix: true
12
- });
13
- const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(argumentListCtx)
14
- ? ifBreak(indent(concat([softline, rBrace])), printTokenWithComments(rBrace), { groupId: lambdaParametersGroupId })
15
- : indent(concat([softline, rBrace]));
16
- return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
17
- }
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRTaW5nbGVMYW1iZGFJbnZvY2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByaW50U2luZ2xlTGFtYmRhSW52b2NhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSx5Q0FBeUMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25GLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU3RCxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxHQUFHLFFBQVEsQ0FBQztBQUV2QyxNQUFNLENBQUMsT0FBTyxVQUFVLDJCQUEyQixDQUNqRCxlQUFrRCxFQUNsRCxNQUFjLEVBQ2QsTUFBYztJQUVkLE1BQU0sdUJBQXVCLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDM0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUU7UUFDL0MsdUJBQXVCO1FBQ3ZCLDhCQUE4QixFQUFFLElBQUk7S0FDckMsQ0FBQyxDQUFDO0lBRUgsTUFBTSxlQUFlLEdBQUcseUNBQXlDLENBQy9ELGVBQWUsQ0FDaEI7UUFDQyxDQUFDLENBQUMsT0FBTyxDQUNMLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUNsQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsRUFDOUIsRUFBRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsQ0FDckM7UUFDSCxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7QUFDMUUsQ0FBQyJ9