Merge branch 'eclipse-jdt:master' into master

Author: carstenartur

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

@@ -430,5 +430,36 @@ void foo(){}
 			assertEquals("sequence doesn't match", expectedCodeSequence, actualSnippet);
 		}
 	}
+
+	@Test
+	public void testCharConstant() throws Exception {
+		String source=
+				"""
+				package p;
+				public class Javadoc {
+					static final char c = (char)0;
+				}
+			""";
+		ICompilationUnit cu= getWorkingCopy("/TestSetupProject/src/p/Javadoc.java", source, null);
+		assertNotNull("TestClass.java", cu);
+
+		IType type= cu.getType("Javadoc");
+		// check javadoc on each member:
+		for (IJavaElement member : type.getChildren()) {
+			IJavaElement[] elements= { member };
+			ISourceRange range= ((ISourceReference) member).getNameRange();
+			JavadocBrowserInformationControlInput hoverInfo= JavadocHover.getHoverInfo(elements, cu, new Region(range.getOffset(), range.getLength()), null);
+			String actualHtmlContent= hoverInfo.getHtml();
+			System.out.println(actualHtmlContent);
+
+			String expectedCodeSequence = "char <a class='header' href='eclipse-javadoc:%E2%98%82=TestSetupProject/src%3Cp'>p</a>.<a class='header' href='eclipse-javadoc:%E2%98%82=TestSetupProject/src%3Cp%7BJavadoc.java%E2%98%83Javadoc'>Javadoc</a>.c</span> : <span style='white-space:pre'>'' [\\u0000]";
+
+			int index= actualHtmlContent.lastIndexOf("char");
+			assertNotEquals(-1, index);
+			String actualSnippet= actualHtmlContent.substring(index, index + expectedCodeSequence.length());
+			assertEquals("sequence doesn't match", expectedCodeSequence, actualSnippet);
+		}
+	}
+
 }
 

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java

@@ -2145,8 +2145,8 @@ public static SemanticHighlighting[] getSemanticHighlightings() {
 				new MethodHighlighting(), // before types to get ctors
 				new TypeArgumentHighlighting(), // before other types
 				new AbstractClassHighlighting(), // before classes
-				new ClassHighlighting(),
 				new RecordHighlighting(),
+				new ClassHighlighting(),
 				new EnumHighlighting(),
 				new AnnotationHighlighting(), // before interfaces
 				new InterfaceHighlighting(),

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java

@@ -1362,9 +1362,9 @@ private static StringBuffer addLink(StringBuffer buf, String uri, String label)
 
 	public static String getHexConstantValue(Object constantValue) {
 		if (constantValue instanceof Character) {
-			String constantResult= '\'' + constantValue.toString() + '\'';
-
 			char charValue= ((Character) constantValue);
+			String constantResult= '\'' + (charValue == 0 ? "" : constantValue.toString()) + '\''; //$NON-NLS-1$
+
 			String hexString= Integer.toHexString(charValue);
 			StringBuilder hexResult= new StringBuilder("\\u"); //$NON-NLS-1$
 			for (int i= hexString.length(); i < 4; i++) {