Merge branch 'master' of https://github.com/daanschipper/javaparser

3 files changed, 21 insertions, 0 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
index 8d3fca97a..e45ed7580 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
@@ -273,6 +273,7 @@ public class ConcreteSyntaxModel {
                 comment(),
                 token(GeneratedJavaParserConstants.LBRACE),
                 list(ObservableProperty.VALUES, sequence(comma(), space()), space(), space()),
+                orphanCommentsEnding(),
                 token(RBRACE)));
 
         concreteSyntaxModelByClass.put(AssignExpr.class, sequence(
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
index d68f38752..8a1d6b510 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -548,6 +548,7 @@ public class PrettyPrintVisitor implements VoidVisitor<Void> {
             }
             printer.print(" ");
         }
+        printOrphanCommentsEnding(n);
         printer.print("}");
     }
 
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java b/javaparser-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java
index 37addda46..c44a63f50 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java
@@ -81,4 +81,23 @@ public class CommentsInserterTest {
                 "}\n", cu.toString());
     }
 
+    @Test
+    public void issue234LosingCommentsInArrayInitializerExpr() {
+        CompilationUnit cu = parse("@Anno(stuff={" + EOL +
+                "    // Just," + EOL +
+                "    // an," + EOL +
+                "    // example" + EOL +
+                "})" + EOL +
+                "class ABC {" + EOL +
+                "" + EOL +
+                "}");
+
+        assertEqualsNoEol("@Anno(stuff = {// Just,\n" +
+                "// an,\n" +
+                "// example\n" +
+                "})\n" +
+                "class ABC {\n" +
+                "}\n", cu.toString());
+    }
+
 }