ROASTER-59: Fixed multi-line javadoc parsing

forge · Sep 28, 2015 · 7dafd40 · 7dafd40
1 parent 0e7fe81
commit 7dafd40
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/JavaDocImpl.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/JavaDocImpl.java
@@ -79,10 +79,16 @@ public String getFullText()
       for (TagElement tagElement : tagList)
       {
          if (tagElement.getTagName() != null)
+         {
             text.append(tagElement.getTagName());
-         for (Object fragment : tagElement.fragments())
+         }
+         List<Object> fragments = tagElement.fragments();
+         for (Iterator<Object> iterator = fragments.iterator(); iterator.hasNext();)
          {
+            Object fragment = iterator.next();
             text.append(fragment);
+            if (iterator.hasNext())
+               text.append(' ');
          }
          text.append(System.getProperty("line.separator"));
       }

diff --git a/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaDocTest.java b/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaDocTest.java
@@ -167,4 +167,17 @@ public void testJavaDocEnumConstant() throws Exception
       Assert.assertEquals(expected, javaDoc.getFullText());
    }
 
+   @Test
+   public void testJavaDocMultiLineShouldNotConcatenateWords() throws Exception
+   {
+      String text = "/**" + LINE_SEPARATOR
+               + "* The country where this currency is used mostly. This field is just for" + LINE_SEPARATOR
+               + "* informational purposes and have no effect on any processing." + LINE_SEPARATOR
+               + "*/" + LINE_SEPARATOR
+               + "public class MyClass{}";
+      JavaClassSource javaClass = Roaster.parse(JavaClassSource.class, text);
+      JavaDocSource<JavaClassSource> javaDoc = javaClass.getJavaDoc();
+      String expected = "The country where this currency is used mostly. This field is just for informational purposes and have no effect on any processing.";
+      Assert.assertEquals(expected, javaDoc.getFullText());
+   }
 }