fix: get correct descriptions from CtJavaDocImpl (INRIA#4061)

Author: andrewbwogi

src/main/java/spoon/support/reflect/code/CtJavaDocImpl.java

@@ -85,17 +85,27 @@ public <E extends CtJavaDoc> E removeTag(CtJavaDocTag tag) {
 
 	@Override
 	public String getShortDescription() {
-		int indexEndSentence = this.getContent().indexOf('.');
-		if (indexEndSentence == -1) {
-			indexEndSentence = this.getContent().indexOf('\n');
+		int indexOfFirstSentenceEnd = indexOfFirstSentenceEnd(this.getContent());
+		if (indexOfFirstSentenceEnd == -1) {
+			indexOfFirstSentenceEnd = this.getContent().indexOf('\n');
 		}
-		if (indexEndSentence != -1) {
-			return this.getContent().substring(0, indexEndSentence + 1).trim();
+		if (indexOfFirstSentenceEnd != -1) {
+			return this.getContent().substring(0, indexOfFirstSentenceEnd + 1).trim();
 		} else {
 			return this.getContent().trim();
 		}
 	}
 
+	private int indexOfFirstSentenceEnd(String content) {
+		int index = content.indexOf('.');
+		while (index < content.length() - 1
+				&& !Character.isWhitespace(content.charAt(index + 1))
+				&& index != -1) {
+			index = content.indexOf('.', index + 1);
+		}
+		return index;
+	}
+
 	/**
 	 * Parses the content string to split in two: the description and the Javadoc tags
 	 */

src/test/java/spoon/test/comment/CommentTest.java

@@ -80,6 +80,7 @@
 import spoon.test.comment.testclasses.TestClassWithComments;
 import spoon.test.comment.testclasses.WildComments;
 import spoon.test.comment.testclasses.WindowsEOL;
+import spoon.test.comment.testclasses.JavaDocWithLink;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -169,6 +170,22 @@ public void testJavadocShortAndLongComment() {
 		assertEquals("A short description without a proper end", classJavaDoc.getLongDescription());
 	}
 
+	@Test
+	public void testJavadocCommentWithLink() {
+		// contract: the CtJavaDoc short and long descriptions are correct when the Javadoc comment contains a qualified name
+		Factory f = getSpoonFactory();
+		CtClass<?> type = (CtClass<?>) f.Type().get(JavaDocWithLink.class);
+		CtJavaDoc classJavaDoc = (CtJavaDoc) type.getComments().get(0);
+		assertEquals("{@link spoon.Launcher Launcher}.", classJavaDoc.getShortDescription());
+
+		classJavaDoc = (CtJavaDoc) type.getField("field1").getComments().get(0);
+		assertEquals("{@link spoon.Launcher Launcher}", classJavaDoc.getShortDescription());
+
+		classJavaDoc = (CtJavaDoc) type.getField("field2").getComments().get(0);
+		assertEquals("{@link spoon.Launcher Launcher}.", classJavaDoc.getShortDescription());
+		assertEquals("Additional text.", classJavaDoc.getLongDescription());
+	}
+
 	@Test
 	public void testJavaDocCommentOnMac() {
 		String EOL = "\n";

src/test/java/spoon/test/comment/testclasses/JavaDocWithLink.java

@@ -0,0 +1,17 @@
+package spoon.test.comment.testclasses;
+
+/**
+ * {@link spoon.Launcher Launcher}.
+ */
+public class JavaDocWithLink {
+
+    /**
+     * {@link spoon.Launcher Launcher}
+     */
+    int field1;
+
+    /**
+     * {@link spoon.Launcher Launcher}. Additional text.
+     */
+    int field2;
+}