fix(comment): fixes pretty-printing bug for inline arrays with commen…

…ts (closes #911)

src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java

@@ -1240,24 +1240,32 @@ public <T> void visitCtNewArray(CtNewArray<T> newArray) {
 		}
 		if (newArray.getDimensionExpressions().size() == 0) {
 			printer.write("{ ");
-			for (CtExpression e : newArray.getElements()) {
+			List<CtExpression<?>> l_elements = newArray.getElements();
+			for (int i = 0; i < l_elements.size(); i++) {
+				CtExpression e = l_elements.get(i);
 				if (!(e instanceof CtStatement)) {
 					elementPrinterHelper.writeComment(e, CommentOffset.BEFORE);
 				}
 				scan(e);
 				printer.write(" , ");
+				if (i + 1 == l_elements.size()) {
+					/*
+					 * we have to remove last char before we writeComment.
+					 * We cannot simply skip adding of " , ",
+					 * because it influences formatting and EOL too
+					 */
+					printer.removeLastChar();
+				}
 				if (!(e instanceof CtStatement)) {
 					elementPrinterHelper.writeComment(e, CommentOffset.AFTER);
 				}
 			}
-			if (newArray.getElements().size() > 0) {
-				printer.removeLastChar();
-			}
 			printer.write(" }");
 		}
 		exitCtExpression(newArray);
 	}
 
+
 	@Override
 	public <T> void visitCtConstructorCall(CtConstructorCall<T> ctConstructorCall) {
 		enterCtStatement(ctConstructorCall);

src/test/java/spoon/test/arrays/ArraysTest.java

@@ -76,4 +76,19 @@ public void testCtNewArrayInnerCtNewArray() throws Exception {
 			fail(e.getMessage());
 		}
 	}
+
+	@Test
+	public void testCtNewArrayWitComments() throws Exception {
+		final Launcher launcher = new Launcher();
+		launcher.addInputResource("src/test/java/spoon/test/arrays/testclasses/NewArrayWithComment.java");
+		launcher.getEnvironment().setCommentEnabled(true);
+		launcher.setSourceOutputDirectory("target/foo2");
+		launcher.buildModel();
+		launcher.prettyprint();
+		try {
+			launcher.getModelBuilder().compile();
+		} catch (Exception e) {
+			fail(e.getMessage());
+		}
+	}
 }

src/test/java/spoon/test/arrays/testclasses/NewArrayWithComment.java

@@ -0,0 +1,11 @@
+package spoon.test.arrays.testclasses;
+
+public class NewArrayWithComment
+{
+	String[] anArray1 = new String[]{"a","b"/*,"c"*/}; 
+	String[] anArray2 = new String[]{
+			"a",	//a comment
+			"b",	//b comment
+			"c"		//c comment
+			}; 
+}