Fixed issue #2099 accounting for leading /* commentary.

javaparser · Mar 1, 2019 · b464ba7 · b464ba7
1 parent 31f5fad
commit b464ba7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/.../src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java b/.../src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java
@@ -147,7 +147,7 @@ void exampleParam5() throws IOException {
     }
 
     @Test
-    void issue2099AddingAddingStatementAfterTraillingComment() {
+    void issue2099AddingAddingStatementAfterTraillingComment1() {
         Statement statement = LexicalPreservingPrinter.setup(StaticJavaParser.parseStatement(
                 "    if(value != null) {" + EOL +
                         "        value.value();" + EOL +
@@ -170,4 +170,29 @@ void issue2099AddingAddingStatementAfterTraillingComment() {
         assertEqualsNoEol(expected, s);
     }
 
+    @Test
+    void issue2099AddingAddingStatementAfterTraillingComment2() {
+        Statement statement = LexicalPreservingPrinter.setup(StaticJavaParser.parseStatement(
+                "    if(value != null) {" + EOL +
+                        "        value.value();" + EOL +
+                        "    }"));
+
+        BlockStmt blockStmt = LexicalPreservingPrinter.setup(StaticJavaParser.parseBlock("{" + EOL +
+                "       value1();" + EOL +
+                "    value2(); /* test */" + EOL +
+                "}"));
+
+        blockStmt.addStatement(statement);
+        String s = LexicalPreservingPrinter.print(blockStmt);
+        String expected = "{\n" +
+                "       value1();\n" +
+                "    value2(); /* test */\n" +
+                "    if(value != null) {\n" +
+                "        value.value();\n" +
+                "    }\n" +
+                "}";
+        assertEqualsNoEol(expected, s);
+    }
+
+
 }
diff --git a/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java b/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
@@ -574,6 +574,10 @@ private void applyAddedDiffElement(Added added) {
         if (!used) {
             if(nodeText.numberOfElements() > originalIndex + 1 &&
                 nodeText.getTextElement(originalIndex).isComment()) {
+                String expanded = nodeText.getTextElement(originalIndex).expand();
+                if(expanded.startsWith("/*")) {
+                    originalIndex++;
+                }
                 originalIndex++;
                 for (TextElement e : indentationBlock()) {
                     nodeText.addElement(originalIndex++, e);