From 5584a2102faf5af771494a257a7b5113b3fe39bf Mon Sep 17 00:00:00 2001
From: Jay Arthanareeswaran <jarthana@in.ibm.com>
Date: Wed, 25 Sep 2024 09:14:03 +0530
Subject: [PATCH] [23] Markdown doc comments with codeblock don't parse Javadoc
 tags afterwards (#1665)

 Test case for
https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2980
 Also by:
---
 .../ui/tests/hover/MarkdownCommentTests.java  | 150 +++++++++++++++++-
 1 file changed, 149 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/hover/MarkdownCommentTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/hover/MarkdownCommentTests.java
index f7c03e78fa3..9c05bf02e20 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/hover/MarkdownCommentTests.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/hover/MarkdownCommentTests.java
@@ -808,4 +808,152 @@ void paraAfterCode() { }
 				""";
 		assertHtmlContent(expectedContent, actualHtmlContent);
 	}
-}
+	@Test
+	public void testGH2980() throws CoreException {
+		String source= """
+				package p;
+
+				public class X {
+					/// This is a test Javadoc for method test1()
+					/// ```java
+					/// test1(42);
+					/// ```
+					/// @param a some parameter for test1
+					public void test1(int a) {}
+					///
+					/// This is a test Javadoc for method test2()
+					/// 'test2(0)'
+					/// @param b some parameter for test1
+					public void test2(int b) {}
+					/// This is a test Javadoc for method test3()
+					/// ```java
+					/// int r = test3();
+					/// System.out.println(r);
+					/// ```
+					/// @return an int value
+					public int test3() {
+						return 0;
+					}
+					/// This is a test Javadoc for method test4()
+					/// Invocation method 1:
+					/// ```java
+					/// int r = test4();
+					/// System.out.println(r);
+					/// ```
+					/// Invocation method 2:
+					/// ```java
+					/// System.out.println(test4());
+					/// ```
+					/// @return an int value
+					/// @param i an int param
+					public int test4(int i) {
+						return 0;
+					}
+				}
+				""";
+		ICompilationUnit cu= getWorkingCopy("/TestSetupProject/src/p/X.java", source, null);
+		assertNotNull("X.java", cu);
+
+		IType type= cu.getType("X");
+
+		IMethod method= type.getMethods()[0];
+		String actualHtmlContent= getHoverHtmlContent(cu, method);
+		String expectedContent= """
+					<p>This is a test Javadoc for method test1()</p>
+					<pre><code class="language-java">test1(42);
+					</code></pre>
+					<dl><dt>Parameters:</dt><dd><b>a</b> some parameter for test1</dd></dl>
+					""";
+		assertHtmlContent(expectedContent, actualHtmlContent);
+
+		method= type.getMethods()[1];
+		actualHtmlContent= getHoverHtmlContent(cu, method);
+		expectedContent= """
+					<p>This is a test Javadoc for method test2()
+					'test2(0)'</p>
+					<dl><dt>Parameters:</dt><dd><b>b</b> some parameter for test1</dd></dl>
+					""";
+		assertHtmlContent(expectedContent, actualHtmlContent);
+
+		method= type.getMethods()[2];
+		actualHtmlContent= getHoverHtmlContent(cu, method);
+		expectedContent= """
+					<p>This is a test Javadoc for method test3()</p>
+					<pre><code class="language-java">int r = test3();
+					System.out.println(r);
+					</code></pre>
+					<dl><dt>Returns:</dt><dd>an int value</dd></dl>
+					""";
+		method= type.getMethods()[3];
+		actualHtmlContent= getHoverHtmlContent(cu, method);
+		expectedContent= """
+					<p>This is a test Javadoc for method test4()
+					Invocation method 1:</p>
+					<pre><code class="language-java">int r = test4();
+					System.out.println(r);
+					</code></pre>
+					<p>Invocation method 2:</p>
+					<pre><code class="language-java">System.out.println(test4());
+					</code></pre>
+					<dl><dt>Parameters:</dt><dd><b>i</b> an int param</dd><dt>Returns:</dt><dd>an int value</dd></dl>
+					""";
+		assertHtmlContent(expectedContent, actualHtmlContent);
+	}
+	@Test
+	public void testFenceLenFour_1() throws CoreException {
+		String source= """
+				/// ````
+				/// ```
+				/// @param is not a tag here because this is nested literal *markdown*
+				/// ```
+				/// ````
+				public class FenceLenFour {
+				}
+				""";
+		ICompilationUnit cu= getWorkingCopy("/TestSetupProject/src/p/FenceLenFour.java", source, null);
+		assertNotNull("FenceLenFour.java", cu);
+
+		String expectedContent= """
+				<pre><code>```
+				@param is not a tag here because this is nested literal *markdown*
+				```
+				</code></pre>
+				""";
+		IType type= cu.getType("FenceLenFour");
+		String actualHtmlContent= getHoverHtmlContent(cu, type);
+		assertHtmlContent(expectedContent, actualHtmlContent);
+	}
+	@Test
+	public void testFenceLenFour_2() throws CoreException {
+		String source= """
+				public class FenceLenFour {
+					/// `````
+					/// ````
+					/// ```
+					/// @param is not a tag here because this is nested literal *markdown*
+					/// ```
+					/// ````
+					/// `````
+					/// @return an int value
+					/// @param i real param
+					public int foo(int i) {
+						return 0;
+					}
+				}
+				""";
+		ICompilationUnit cu= getWorkingCopy("/TestSetupProject/src/p/FenceLenFour.java", source, null);
+		assertNotNull("FenceLenFour.java", cu);
+
+		String expectedContent= """
+				<pre><code>```
+				@param is not a tag here because this is nested literal *markdown*
+				```
+				</code></pre>
+				<dl><dt>Returns:</dt><dd>an int value</dd></dl>
+				""";
+		IType type= cu.getType("FenceLenFour");
+		IMethod method= type.getMethods()[0];
+		String actualHtmlContent= getHoverHtmlContent(cu, method);
+		assertHtmlContent(expectedContent, actualHtmlContent);
+	}
+}
\ No newline at end of file