code re-factor

Author: subyssurendran666

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterMarkdownTest.java

@@ -2031,7 +2031,6 @@ public class Markdown() {}
 			TagElement tags = (TagElement) javadoc.tags().get(0);
 			assertTrue(tags.fragments().get(0) instanceof TextElement);
 			assertTrue(tags.fragments().get(1) instanceof TextElement);
-			assertTrue(tags.fragments().get(2) instanceof TextElement);
 		}
 	}
 
@@ -2139,7 +2138,7 @@ public class Markdown() {}
 
 	public void testMarkdownURLs4531_12() throws JavaModelException {
 		String source = """
-				/// @see [Ex Si)(http://ex.com    ) [Ex Si](    https://www.ex.com)
+				/// @see [Ex Si](http://ex.com    ) [Ex Si](    https://www.ex.com)
 				public class Markdown() {}
 				""";
 

org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/DocCommentParser.java

@@ -734,56 +734,19 @@ protected boolean parseMarkdownLinks(int previousPosition) throws InvalidInputEx
 					}
 					break;
 				case ')':
+					if (peekChar() == '\n' || peekChar() == ' ') {
+						valid = parseMarkdownLinkTags(true, start, previousPosition, tStart, tEnd);
+						break loop;
+					}
+					break;
 				case ']':
 					if ((peekChar() == '[' ) || peekChar() == '(') {
 						tStart = start;
 						tEnd = this.index - 1;
 						currentChar = readChar();
 						start = this.index;
 					} else if (peekChar() != ']') {
-						int eofBkup = this.scanner.eofPosition;
-						this.scanner.eofPosition = this.index - 1;
-						this.scanner.resetTo(start, this.javadocEnd);
-						this.inlineTagStarted = true;
-						this.inlineTagStart = previousPosition;
-						this.tagValue = TAG_LINK_VALUE;
-						int indexBkup = this.index;
-						if(currentChar != ']')
-							valid = parseURLReference();
-						else
-							valid = parseReference(true);
-						this.index = indexBkup;
-						// This creates a two level structure. The @link tag is added to
-						// another tag element, which gets added to the astStack
-						// Both tag elements must get the same source range.
-						TagElement previousTag = (TagElement) this.astStack[this.astPtr];
-						int parentStart = previousTag.getStartPosition();
-						previousTag.setSourceRange(parentStart, this.index - parentStart);
-						List fragments = previousTag.fragments();
-						int size = fragments.size();
-						if (size == 0) {
-							// no existing fragment => just add the element
-							TagElement inlineTag = this.ast.newTagElement();
-							fragments.add(inlineTag);
-							previousTag = inlineTag;
-						} else {
-							// If last fragment is a tag, then use it as previous tag
-							ASTNode lastFragment = (ASTNode) fragments.get(size-1);
-							if (lastFragment.getNodeType() == ASTNode.TAG_ELEMENT) {
-								lastFragment.setSourceRange(lastFragment.getStartPosition(), this.index - previousPosition);
-								previousTag = (TagElement) lastFragment;
-							}
-						}
-						if (tEnd != -1) {
-							TextElement text = this.ast.newTextElement();
-							text.setText(new String( this.source, tStart, tEnd-tStart));
-							text.setSourceRange(tStart, tEnd-tStart);
-							previousTag.fragments().add(0, text);
-						}
-						this.tagValue = NO_TAG_VALUE;
-						this.inlineTagStarted = false;
-						this.inlineTagStart = -1;
-						this.scanner.eofPosition = eofBkup;
+						valid = parseMarkdownLinkTags(false, start, previousPosition, tStart, tEnd);
 						break loop;
 					}
 					break;
@@ -799,6 +762,54 @@ protected boolean parseMarkdownLinks(int previousPosition) throws InvalidInputEx
 		return valid;
 	}
 
+	private boolean parseMarkdownLinkTags(boolean refFlag, int start, int previousPosition, int tStart, int tEnd ) throws InvalidInputException {
+		boolean valid = false;
+		int eofBkup = this.scanner.eofPosition;
+		this.scanner.eofPosition = this.index - 1;
+		this.scanner.resetTo(start, this.javadocEnd);
+		this.inlineTagStarted = true;
+		this.inlineTagStart = previousPosition;
+		this.tagValue = TAG_LINK_VALUE;
+		int indexBkup = this.index;
+		if (refFlag)
+			valid = parseURLReference();
+		else
+			valid = parseReference(true);
+		this.index = indexBkup;
+		// This creates a two level structure. The @link tag is added to
+		// another tag element, which gets added to the astStack
+		// Both tag elements must get the same source range.
+		TagElement previousTag = (TagElement) this.astStack[this.astPtr];
+		int parentStart = previousTag.getStartPosition();
+		previousTag.setSourceRange(parentStart, this.index - parentStart);
+		List fragments = previousTag.fragments();
+		int size = fragments.size();
+		if (size == 0) {
+			// no existing fragment => just add the element
+			TagElement inlineTag = this.ast.newTagElement();
+			fragments.add(inlineTag);
+			previousTag = inlineTag;
+		} else {
+			// If last fragment is a tag, then use it as previous tag
+			ASTNode lastFragment = (ASTNode) fragments.get(size-1);
+			if (lastFragment.getNodeType() == ASTNode.TAG_ELEMENT) {
+				lastFragment.setSourceRange(lastFragment.getStartPosition(), this.index - previousPosition);
+				previousTag = (TagElement) lastFragment;
+			}
+		}
+		if (tEnd != -1) {
+			TextElement text = this.ast.newTextElement();
+			text.setText(new String( this.source, tStart, tEnd-tStart));
+			text.setSourceRange(tStart, tEnd-tStart);
+			previousTag.fragments().add(0, text);
+		}
+		this.tagValue = NO_TAG_VALUE;
+		this.inlineTagStarted = false;
+		this.inlineTagStart = -1;
+		this.scanner.eofPosition = eofBkup;
+		return valid;
+	}
+
 	@Override
 	protected boolean parseTag(int previousPosition) throws InvalidInputException {
 		this.markdownHelper.resetLineStart();