markdown link optimisation

Author: subyssurendran666

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java

@@ -1417,35 +1417,54 @@ private boolean isFollowedByURLPattern() {
 	}
 
 	// Parses a complete URL reference starting from current position
-	private Object parseURLReference() throws InvalidInputException {
+	private Object parseURLReference(boolean httpFlag) throws InvalidInputException {
+		// httpFlag is used to check wheather URL contains http or not
 		StringBuilder urlBuilder = new StringBuilder();
 		int firstTokenStartPos = this.scanner.startPosition;
 		//start with the current identifier
 		if (this.currentTokenType == TerminalToken.TokenNameIdentifier) {
 			urlBuilder.append(this.scanner.getCurrentTokenSource());
 			consumeToken();
 		}
+		char[] fullURL;
+		int pos;
+		if (httpFlag) {
+			// Add :
+			TerminalToken token1 = readTokenSafely();
+			if (token1 == TerminalToken.TokenNameCOLON) {
+				urlBuilder.append(this.scanner.getCurrentTokenSource());
+				consumeToken();
+			}
 
-		// Add :
-		TerminalToken token1 = readTokenSafely();
-		if (token1 == TerminalToken.TokenNameCOLON) {
-			urlBuilder.append(this.scanner.getCurrentTokenSource());
-			consumeToken();
-		}
+			pos = this.scanner.getCurrentTokenEndPosition() + 1;
+			char c;
+			while (pos < this.source.length) {
+				c = (this.source[pos] == ')') ? this.source[pos] : readChar();
+
+				if (c == ':') continue;
+		        if (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '*' || c == ')' || c == '(' || c == '[' || c == ']' ) {
+		            break;
+		        }
+		        urlBuilder.append(c);
+		        pos++;
+			}
+			fullURL = urlBuilder.toString().toCharArray();
+		} else {
 
-		int pos = this.scanner.getCurrentTokenEndPosition() + 1;
-		char c;
-		while (pos < this.source.length) {
-			c = (this.source[pos] == ')') ? this.source[pos] : readChar();
+			//process the second token
+			TerminalToken token1 = readTokenSafely();
+			if (token1 == TerminalToken.TokenNameDOT) {
+				urlBuilder.append(this.scanner.getCurrentTokenSource());
+				consumeToken();
+			}
 
-			if (c == ':') continue;
-	        if (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '*' || c == ')' || c == '(' || c == '[' || c == ']' ) {
-	            break;
-	        }
-	        urlBuilder.append(c);
-	        pos++;
+			TerminalToken token2 = readTokenSafely();
+			if (token2 == TerminalToken.TokenNameIdentifier) {
+				urlBuilder.append(this.scanner.getCurrentTokenSource());
+			}
+			pos = this.scanner.getCurrentTokenEndPosition() + 1;
+			fullURL = urlBuilder.toString().toCharArray();
 		}
-		char[] fullURL = urlBuilder.toString().toCharArray();
 		this.identifierPtr = 0;
 		this.identifierStack[this.identifierPtr] =  fullURL;
 		this.identifierPositionStack[this.identifierPtr] = (((long) firstTokenStartPos) << 32) + (pos - 1);
@@ -1454,7 +1473,8 @@ private Object parseURLReference() throws InvalidInputException {
 	}
 
 	// Ensure the markdown URL bracket syntax follows []() or [][]
-	private void checkMarkdownLinkSyntaxValid(int currStartPos) {
+	private void checkMarkdownLinkSyntaxValid(int currStartPos, boolean httpFlag) {
+		// httpFlag is used to check wheather URL contains http or not
 		char secondBracket = this.source[currStartPos - 2];
 		char thirdBracket = this.source[currStartPos - 1];
 
@@ -1573,15 +1593,23 @@ else if (this.tagValue == TAG_VALUE_VALUE) {
 					case TokenNameUNDERSCORE:
 					case TokenNameIdentifier :
 						char[] identifier = this.scanner.getCurrentIdentifierSource();
-						if (isURLScheme(identifier)) {
-							if (isFollowedByURLPattern()) {
-								if (typeRef == null) {
-									int currStartPos = this.scanner.startPosition;
-									typeRefStartPosition = this.scanner.getCurrentTokenStartPosition();
-									typeRef = parseURLReference();
-									checkMarkdownLinkSyntaxValid(currStartPos);
-									if (this.abort) return false;
+						if (this.source[this.scanner.getCurrentTokenStartPosition() - 1] == '(') {
+							if (isURLScheme(identifier)) {
+								if (isFollowedByURLPattern()) {
+									if (typeRef == null) {
+										int currStartPos = this.scanner.startPosition;
+										typeRefStartPosition = this.scanner.getCurrentTokenStartPosition();
+										typeRef = parseURLReference(true);
+										checkMarkdownLinkSyntaxValid(currStartPos, true);
+										if (this.abort) return false;
+									}
 								}
+							} else if (this.source[this.scanner.getCurrentTokenEndPosition() +1 ] == '.') { //$NON-NLS-1$
+								int currStartPos = this.scanner.startPosition;
+								typeRefStartPosition = this.scanner.getCurrentTokenStartPosition();
+								typeRef = parseURLReference(false);
+								checkMarkdownLinkSyntaxValid(currStartPos, true);
+								if (this.abort) return false;
 							}
 						}
 						if (typeRef == null) {

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

@@ -1931,7 +1931,7 @@ public class Markdown() {}
 			TagElement tagElement = (TagElement) tags.fragments().get(1);
 			List<?> tagFragments = tagElement.fragments();
 			assertTrue(tagFragments.get(0) instanceof TextElement);
-			assertTrue(tagFragments.get(1) instanceof QualifiedName);
+			assertTrue(tagFragments.get(1) instanceof SimpleName);
 		}
 	}
 
@@ -1995,6 +1995,7 @@ public class Markdown() {}
 		}
 	}
 
+	// invalid syntax
 	public void testMarkdownURLs4531_05() throws JavaModelException {
 		String source = """
 				/// @see [Ex Si][http://ex.com]
@@ -2007,11 +2008,10 @@ public class Markdown() {}
 			TypeDeclaration typedeclaration =  (TypeDeclaration) compilUnit.types().get(0);
 			Javadoc javadoc = typedeclaration.getJavadoc();
 			TagElement tags = (TagElement) javadoc.tags().get(0);
-			assertEquals("fragments count does not match", 2, tags.fragments().size());
-			TagElement tagElement = (TagElement) tags.fragments().get(1);
-			List<?> tagFragments = tagElement.fragments();
-			assertTrue(tagFragments.get(0) instanceof TextElement);
-			assertTrue(tagFragments.get(1) instanceof SimpleName);
+			assertEquals("fragments count does not match", 3, tags.fragments().size());
+			assertTrue(tags.fragments().get(0) instanceof TextElement);
+			assertTrue(tags.fragments().get(1) instanceof TextElement);
+			assertTrue(tags.fragments().get(2) instanceof TextElement);
 		}
 	}