Merge pull request #1537 from ftomassetti/issue1533

Issue 1533
javaparser · May 8, 2018 · ad192e5 · ad192e5
2 parents 5dc9192 + 697175a
commit ad192e5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java
@@ -22,12 +22,16 @@
 package com.github.javaparser.javadoc;
 
 import com.github.javaparser.JavaParser;
+import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.javadoc.description.JavadocDescription;
 import com.github.javaparser.javadoc.description.JavadocDescriptionElement;
 import com.github.javaparser.javadoc.description.JavadocInlineTag;
+import com.github.javaparser.javadoc.description.JavadocSnippet;
 import org.junit.Test;
 
+import java.util.List;
+
 import static com.github.javaparser.utils.Utils.EOL;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -135,4 +139,14 @@ public void descriptionModificationWorks() {
         assertEquals(inlineTag, description.getElements().remove(0));
         assertEquals(0, description.getElements().size());
     }
+
+    @Test
+    public void issue1533() {
+        CompilationUnit compilationUnit = JavaParser.parse("/** hallo {@link Foo} welt */ public interface Foo extends Comparable { }");
+        List<JavadocDescriptionElement> elements = compilationUnit.getType(0).getJavadoc().get().getDescription().getElements();
+        assertEquals(3, elements.size());
+        assertEquals(new JavadocSnippet("hallo "), elements.get(0));
+        assertEquals(new JavadocInlineTag("link", JavadocInlineTag.Type.LINK, " Foo"), elements.get(1));
+        assertEquals(new JavadocSnippet(" welt"), elements.get(2));
+    }
 }
diff --git a/...testing/src/test/java/com/github/javaparser/javadoc/description/JavadocInlineTagTest.java b/...testing/src/test/java/com/github/javaparser/javadoc/description/JavadocInlineTagTest.java
@@ -31,6 +31,6 @@ public class JavadocInlineTagTest {
     public void javadocInlineTagShouldPersistCustomTagNames() {
         String tag = JavadocInlineTag.fromText("{@foo something}").toText();
 
-        assertEquals(tag, "@foo something");
+        assertEquals(tag, "{@foo something}");
     }
 }
diff --git a/...rser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java b/...rser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
@@ -41,10 +41,10 @@ public static JavadocDescription parseText(String text) {
         Pair<Integer, Integer> nextInlineTagPos;
         while ((nextInlineTagPos = indexOfNextInlineTag(text, index)) != null) {
             if (nextInlineTagPos.a != index) {
-                instance.addElement(new JavadocSnippet(text.substring(index, nextInlineTagPos.a + 1)));
+                instance.addElement(new JavadocSnippet(text.substring(index, nextInlineTagPos.a)));
             }
             instance.addElement(JavadocInlineTag.fromText(text.substring(nextInlineTagPos.a, nextInlineTagPos.b + 1)));
-            index = nextInlineTagPos.b;
+            index = nextInlineTagPos.b + 1;
         }
         if (index < text.length()) {
             instance.addElement(new JavadocSnippet(text.substring(index)));

diff --git a/...parser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java b/...parser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java
@@ -88,7 +88,7 @@ public JavadocInlineTag(String tagName, Type type, String content) {
 
     @Override
     public String toText() {
-        return "@" + tagName + this.content;
+        return "{@" + tagName + this.content +"}";
     }
 
     @Override