Fix various binding and problem conversion issues

eclipse-jdtls · Jul 2, 2024 · c6dc4d0 · c6dc4d0
1 parent 29050ac
commit c6dc4d0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacBindingResolver.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacBindingResolver.java
@@ -442,7 +442,7 @@ IMethodBinding resolveMethod(MethodInvocation method) {
 			javacElement = javacMethodInvocation.getMethodSelect();
 		}
 		if (javacElement instanceof JCIdent ident && ident.sym instanceof MethodSymbol methodSymbol) {
-			return this.bindings.getMethodBinding(ident.type.asMethodType(), methodSymbol);
+			return this.bindings.getMethodBinding(ident.type != null ? ident.type.asMethodType() : methodSymbol.asType().asMethodType(), methodSymbol);
 		}
 		if (javacElement instanceof JCFieldAccess fieldAccess && fieldAccess.sym instanceof MethodSymbol methodSymbol
 				&& fieldAccess.type != null /* when there are syntax errors */) {
@@ -515,7 +515,7 @@ IMethodBinding resolveConstructor(SuperConstructorInvocation expression) {
 			javacElement = javacMethodInvocation.getMethodSelect();
 		}
 		if (javacElement instanceof JCIdent ident && ident.sym instanceof MethodSymbol methodSymbol) {
-			return this.bindings.getMethodBinding(ident.type.asMethodType(), methodSymbol);
+			return this.bindings.getMethodBinding(ident.type != null ? ident.type.asMethodType() : methodSymbol.asType().asMethodType(), methodSymbol);
 		}
 		if (javacElement instanceof JCFieldAccess fieldAccess && fieldAccess.sym instanceof MethodSymbol methodSymbol) {
 			return this.bindings.getMethodBinding(fieldAccess.type.asMethodType(), methodSymbol);
@@ -715,7 +715,7 @@ IMethodBinding resolveConstructor(ConstructorInvocation invocation) {
 			javacElement = javacMethodInvocation.getMethodSelect();
 		}
 		if (javacElement instanceof JCIdent ident && ident.sym instanceof MethodSymbol methodSymbol) {
-			return this.bindings.getMethodBinding(ident.type.asMethodType(), methodSymbol);
+			return this.bindings.getMethodBinding(ident.type != null ? ident.type.asMethodType() : methodSymbol.type.asMethodType(), methodSymbol);
 		}
 		if (javacElement instanceof JCFieldAccess fieldAccess && fieldAccess.sym instanceof MethodSymbol methodSymbol) {
 			return this.bindings.getMethodBinding(fieldAccess.type.asMethodType(), methodSymbol);

diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacProblemConverter.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/JavacProblemConverter.java
@@ -387,6 +387,7 @@ public int toProblemId(Diagnostic<? extends JavaFileObject> diagnostic) {
 			case "compiler.warn.empty.if" -> IProblem.EmptyControlFlowStatement;
 			case "compiler.warn.redundant.cast" -> IProblem.UnnecessaryCast;
 			case "compiler.err.illegal.char" -> IProblem.InvalidCharacterConstant;
+			case "compiler.err.enum.label.must.be.unqualified.enum" -> IProblem.UndefinedField;
 			// next are javadoc; defaulting to JavadocUnexpectedText when no better problem could be found
 			case "compiler.err.dc.bad.entity" -> IProblem.JavadocUnexpectedText;
 			case "compiler.err.dc.bad.inline.tag" -> IProblem.JavadocUnexpectedText;

diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java
@@ -57,6 +57,7 @@
 import com.sun.tools.javac.code.Type.PackageType;
 import com.sun.tools.javac.code.Type.TypeVar;
 import com.sun.tools.javac.code.Type.WildcardType;
+import com.sun.tools.javac.code.TypeTag;
 import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.code.Types.FunctionDescriptorLookupError;
 
@@ -152,6 +153,10 @@ static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf) {
 		if (typeToBuild instanceof Type.JCNoType) {
 			return;
 		}
+		if (typeToBuild.hasTag(TypeTag.UNKNOWN)) {
+			builder.append('*');
+			return;
+		}
 		if (typeToBuild instanceof ArrayType arrayType) {
 			builder.append('[');
 			getKey(builder, arrayType.elemtype, isLeaf);
@@ -513,9 +518,12 @@ public ITypeBinding getSuperclass() {
 
 	@Override
 	public IAnnotationBinding[] getTypeAnnotations() {
-		return this.typeSymbol.getAnnotationMirrors().stream()
-				.map(annotation -> this.resolver.bindings.getAnnotationBinding(annotation, this))
-				.toArray(IAnnotationBinding[]::new);
+		if (this.typeSymbol.hasTypeAnnotations()) {
+			return new IAnnotationBinding[0];
+		}
+		// TODO implement this correctly (used to be returning
+		// same as getAnnotations() which is incorrect
+		return new IAnnotationBinding[0];
 	}
 
 	@Override