prettier-plugin-java 1.0.1 → 1.0.2

package/LICENSE

@@ -1,5 +1,5 @@
 
-    Copyright 2013-2020 Shahar Soel and the respective prettier-java contributors
+    Copyright 2018-2021 the original author or authors from the JHipster project
 
                                  Apache License
                            Version 2.0, January 2004

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "prettier-plugin-java",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Prettier Java Plugin",
   "main": "src/index.js",
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "1.0.0",
-    "lodash": "4.17.20",
+    "java-parser": "1.0.2",
+    "lodash": "4.17.21",
     "prettier": "2.2.1"
   },
   "scripts": {
@@ -20,5 +20,5 @@
     "test:all": "npm-run-all test test:e2e-jhipster1 test:e2e-jhipster2",
     "clone-samples": "node scripts/clone-samples.js"
   },
-  "gitHead": "f25534b7ad3720f5fb22d48b1edf5e601c794837"
+  "gitHead": "d4dbac80d37d361f314205956547becfafca685f"
 }

package/src/printers/classes.js

@@ -354,6 +354,7 @@ class ClassesPrettierVisitor {
         currentSegment = [];
       } else if (token.name === "annotation") {
         currentSegment.push(this.visit([token]));
+        currentSegment.push(" ");
       } else {
         currentSegment.push(token);
         if (

package/src/printers/expressions.js

@@ -167,7 +167,7 @@ class ExpressionsPrettierVisitor {
       groupsOfOperator,
       sortedBinaryOperators
     } = separateTokensIntoGroups(ctx);
-    const segmentsSplittedByBinaryOperator = [];
+    const segmentsSplitByBinaryOperator = [];
     let currentSegment = [];
 
     if (groupsOfOperator.length === 1 && groupsOfOperator[0].length === 0) {
@@ -212,7 +212,7 @@ class ExpressionsPrettierVisitor {
           );
         }
       }
-      segmentsSplittedByBinaryOperator.push(
+      segmentsSplitByBinaryOperator.push(
         group(rejectAndJoin(" ", currentSegment))
       );
     });
@@ -227,7 +227,7 @@ class ExpressionsPrettierVisitor {
               group(
                 rejectAndJoinSeps(
                   sortedBinaryOperators.map(elt => concat([" ", elt, line])),
-                  segmentsSplittedByBinaryOperator
+                  segmentsSplitByBinaryOperator
                 )
               )
             ])
@@ -241,7 +241,7 @@ class ExpressionsPrettierVisitor {
     return group(
       rejectAndJoinSeps(
         sortedBinaryOperators.map(elt => concat([" ", elt, line])),
-        segmentsSplittedByBinaryOperator
+        segmentsSplitByBinaryOperator
       )
     );
   }
@@ -341,7 +341,10 @@ class ExpressionsPrettierVisitor {
         suffixes.push(this.visit(ctx.primarySuffix[i]));
       }
 
-      if (countMethodInvocation === 1) {
+      if (
+        countMethodInvocation === 1 &&
+        ctx.primaryPrefix[0].children.newExpression === undefined
+      ) {
         return group(
           rejectAndConcat([
             primaryPrefix,
@@ -583,10 +586,6 @@ class ExpressionsPrettierVisitor {
   }
 
   methodInvocationSuffix(ctx, params) {
-    if (ctx.argumentList === undefined) {
-      return rejectAndConcat([ctx.LBrace[0], ctx.RBrace[0]]);
-    }
-
     const argumentList = this.visit(ctx.argumentList);
     if (params && params.shouldDedent) {
       return dedent(