Merge remote-tracking branch 'origin/BETA_JAVA24'

Author: jarthana

org.eclipse.jdt.astview/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.astview
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.astview; singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.7.100.qualifier
 Bundle-Activator: org.eclipse.jdt.astview.ASTViewPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java

@@ -132,7 +132,6 @@
 
 import org.eclipse.jdt.ui.JavaUI;
 
-
 public class ASTView extends ViewPart implements IShowInSource, IShowInTargetList {
 
 	private class ASTViewSelectionProvider implements ISelectionProvider {

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/AbstractFastJavaPartitionScanner.java

@@ -353,10 +353,6 @@ public IToken nextToken() {
 					case '\r':
 					case '\n':
 						return postFix(MARKDOWN_COMMENT);
-					case '/':
-						fTokenLength++;
-						fLast= SLASH_SLASH_SLASH;
-						break;
 					default:
 						consume();
 						break;

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/util/ASTHelper.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2024 IBM Corporation and others.
+ * Copyright (c) 2019, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -39,6 +39,7 @@ public class ASTHelper {
 	public static final int JLS21 = AST.JLS21;
 	public static final int JLS22 = AST.JLS22;
 	public static final int JLS23 = AST.JLS23;
+	public static final int JLS24 = AST.JLS24;
 
 	private static boolean isNodeTypeSupportedInAST(AST ast, int nodeType) {
 		switch (nodeType) {

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java

@@ -76,7 +76,7 @@ public final class JavaModelUtil {
 	 */
 	public static final String VERSION_LATEST;
 	static {
-		VERSION_LATEST= JavaCore.VERSION_23; // make sure it is not inlined
+		VERSION_LATEST= JavaCore.VERSION_24; // make sure it is not inlined
 	}
 
 	public static final int VALIDATE_EDIT_CHANGED_CONTENT= 10003;
@@ -847,6 +847,10 @@ public static boolean is23OrHigher(String compliance) {
 		return !isVersionLessThan(compliance, JavaCore.VERSION_23);
 	}
 
+	public static boolean is24OrHigher(String compliance) {
+		return !isVersionLessThan(compliance, JavaCore.VERSION_24);
+	}
+
 	/**
 	 * Checks if the given project or workspace has source compliance 9 or greater.
 	 *
@@ -1002,6 +1006,17 @@ public static boolean is23OrHigher(IJavaProject project) {
 		return is23OrHigher(getSourceCompliance(project));
 	}
 
+	/**
+	 * Checks if the given project or workspace has source compliance 24 or greater.
+	 *
+	 * @param project the project to test or <code>null</code> to test the workspace settings
+	 * @return <code>true</code> if the given project or workspace has source compliance 24 or
+	 *         greater.
+	 */
+	public static boolean is24OrHigher(IJavaProject project) {
+		return is24OrHigher(getSourceCompliance(project));
+	}
+
 	public static String getSourceCompliance(IJavaProject project) {
 		return project != null ? project.getOption(JavaCore.COMPILER_SOURCE, true) : JavaCore.getOption(JavaCore.COMPILER_SOURCE);
 	}
@@ -1027,6 +1042,8 @@ public static String getCompilerCompliance(IVMInstall2 vMInstall, String default
 		String version= vMInstall.getJavaVersion();
 		if (version == null) {
 			return defaultCompliance;
+		} else if (version.startsWith(JavaCore.VERSION_24)) {
+			return JavaCore.VERSION_24;
 		} else if (version.startsWith(JavaCore.VERSION_23)) {
 			return JavaCore.VERSION_23;
 		} else if (version.startsWith(JavaCore.VERSION_22)) {
@@ -1077,7 +1094,9 @@ public static String getExecutionEnvironmentCompliance(IExecutionEnvironment exe
 
 		// fallback:
 		String desc= executionEnvironment.getId();
-		if (desc.indexOf(JavaCore.VERSION_23) != -1) {
+		if (desc.indexOf(JavaCore.VERSION_24) != -1) {
+			return JavaCore.VERSION_24;
+		} else if (desc.indexOf(JavaCore.VERSION_23) != -1) {
 			return JavaCore.VERSION_23;
 		} else if (desc.indexOf(JavaCore.VERSION_22) != -1) {
 			return JavaCore.VERSION_22;

…ests/Java23SemanticHighlightingTest.java …ests/Java24SemanticHighlightingTest.javaorg.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/Java23SemanticHighlightingTest.java renamed to org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/Java24SemanticHighlightingTest.java org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/Java23SemanticHighlightingTest.java renamed to org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/Java24SemanticHighlightingTest.java

@@ -21,14 +21,14 @@
 
 import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingsCore;
 
-public class Java23SemanticHighlightingTest extends AbstractSemanticHighlightingTest {
+public class Java24SemanticHighlightingTest extends AbstractSemanticHighlightingTest {
 
 	@Rule
-	public SemanticHighlightingTestSetup shts= new SemanticHighlightingTestSetup( "/SHTest/src/Java23.java");
+	public SemanticHighlightingTestSetup shts= new SemanticHighlightingTestSetup( "/SHTest/src/Java24.java");
 
 	@Before
 	public void updateCompliance() {
-		shts.updateCompliance("23", true);
+		shts.updateCompliance("24", true);
 	}
 
 	@Test

org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java

@@ -56,7 +56,7 @@
 	SemanticHighlightingTest.class,
 	SemanticTokensProviderTest.class,
 	AutoboxingSemanticHighlightingTest.class,
-	Java23SemanticHighlightingTest.class,
+	Java24SemanticHighlightingTest.class,
 	NewForLoopJavaContextTest.class,
 	IteratorForLoopJavaContextTest.class,
 	ArrayWithTempVarForLoopJavaContextTest.class,

…es/semanticHighlightingTest1/Java23.java …es/semanticHighlightingTest1/Java24.javaorg.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/Java23.java renamed to org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/Java24.java org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/Java23.java renamed to org.eclipse.jdt.text.tests/testResources/semanticHighlightingTest1/Java24.java

@@ -1,6 +1,6 @@
 import module java.base;
 
-public class Java23 {
+public class Java24 {
 	sealed record SampleRecord(String left, String right) {
 
 	}

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/hover/MarkdownCommentTests.java

@@ -983,4 +983,44 @@ void foo() {}
 				""";
 		assertHtmlContent(expectedContent, actualHtmlContent);
 	}
+
+	@Test
+	public void testArrayReferenceInCode() throws CoreException {
+		String source= """
+				/// In the following indented code block, `[i]` is program text,
+				/// and not a hyper link:
+				///
+				///     int i = 3;
+				///     int[] d = new int[i];
+				///
+				/// Likewise, in the following fenced code block, `[i]` is program text,
+				/// and not a hyper link:
+				///
+				/// ```
+				/// int i = 3;
+				/// int[] d = new int[i];
+				/// ```
+				public class ArrayInCode {
+				}
+				""";
+		ICompilationUnit cu= getWorkingCopy("/TestSetupProject/src/p/ArrayInCode.java", source, null);
+		assertNotNull("ArrayInCode.java", cu);
+
+		String expectedContent= """
+				<p>In the following indented code block, <code>[i]</code> is program text,
+				and not a hyper link:</p>
+				<pre><code>int i = 3;
+				int[] d = new int[i];
+				</code></pre>
+				<p>Likewise, in the following fenced code block, <code>[i]</code> is program text,
+				and not a hyper link:</p>
+				<pre><code>int i = 3;
+				int[] d = new int[i];
+				</code></pre>
+				""";
+		IType type= cu.getType("ArrayInCode");
+		String actualHtmlContent= getHoverHtmlContent(cu, type);
+		assertHtmlContent(expectedContent, actualHtmlContent);
+	}
+
 }

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java

@@ -1159,7 +1159,7 @@ protected boolean isIgnoringNewInput(IJavaElement je, IWorkbenchPart part, ISele
 			try {
 				int offset= textSel.getOffset();
 				String partition= ((IDocumentExtension3)document).getContentType(IJavaPartitions.JAVA_PARTITIONING, offset, false);
-				return !IJavaPartitions.JAVA_DOC.equals(partition);
+				return !IJavaPartitions.JAVA_DOC.equals(partition) && !IJavaPartitions.JAVA_MARKDOWN_COMMENT.equals(partition);
 			} catch (BadPartitioningException | BadLocationException ex) {
 				return false;
 			}
@@ -1199,7 +1199,8 @@ protected IJavaElement findSelectedJavaElement(IWorkbenchPart part, ISelection s
 
 						if (document != null) {
 							ITypedRegion typedRegion= TextUtilities.getPartition(document, IJavaPartitions.JAVA_PARTITIONING, textSelection.getOffset(), false);
-							if (IJavaPartitions.JAVA_DOC.equals(typedRegion.getType())){
+							if (IJavaPartitions.JAVA_DOC.equals(typedRegion.getType())
+									|| IJavaPartitions.JAVA_MARKDOWN_COMMENT.equals(typedRegion.getType())){
 								element= TextSelectionConverter.getElementAtOffset((JavaEditor) part, textSelection);
 							}
 							else if (editorInput instanceof IFileEditorInput fei) {