Improve converter & binding for IMemberValuePair

Author: mickaelistria

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacBindingResolver.java

@@ -46,8 +46,11 @@
 import com.sun.tools.javac.api.JavacTaskImpl;
 import com.sun.tools.javac.api.JavacTrees;
 import com.sun.tools.javac.code.Attribute;
-import com.sun.tools.javac.code.Attribute.Compound;
 import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symtab;
+import com.sun.tools.javac.code.TypeTag;
+import com.sun.tools.javac.code.Types;
+import com.sun.tools.javac.code.Attribute.Compound;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
@@ -56,7 +59,6 @@
 import com.sun.tools.javac.code.Symbol.TypeSymbol;
 import com.sun.tools.javac.code.Symbol.TypeVariableSymbol;
 import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.code.Type.ArrayType;
 import com.sun.tools.javac.code.Type.ClassType;
 import com.sun.tools.javac.code.Type.ErrorType;
@@ -68,12 +70,12 @@
 import com.sun.tools.javac.code.Type.ModuleType;
 import com.sun.tools.javac.code.Type.PackageType;
 import com.sun.tools.javac.code.Type.TypeVar;
-import com.sun.tools.javac.code.TypeTag;
-import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
 import com.sun.tools.javac.tree.JCTree.JCAnnotation;
 import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree;
+import com.sun.tools.javac.tree.JCTree.JCAssign;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCExpression;
@@ -94,7 +96,6 @@
 import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
 import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.JCTree.JCWildcard;
-import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Names;
 
@@ -1572,6 +1573,15 @@ IAnnotationBinding resolveAnnotationImpl(Annotation annotation) {
 		}
 		return null;
 	}
+	@Override
+	IMemberValuePairBinding resolveMemberValuePair(MemberValuePair memberValuePair) {
+		resolve();
+		if (this.converter.domToJavac.get(memberValuePair) instanceof JCAssign assign &&
+			assign.lhs instanceof JCIdent ident && ident.sym instanceof MethodSymbol methodSymbol) {
+			return this.bindings.getMemberValuePairBinding(methodSymbol, null);
+		}
+		return null;
+	}
 
 	@Override
 	IBinding resolveReference(MethodRef ref) {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java

@@ -49,8 +49,9 @@
 import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
-import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.TreeInfo;
+import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
 import com.sun.tools.javac.tree.JCTree.JCAnnotation;
 import com.sun.tools.javac.tree.JCTree.JCAnyPattern;
@@ -125,7 +126,6 @@
 import com.sun.tools.javac.tree.JCTree.JCWildcard;
 import com.sun.tools.javac.tree.JCTree.JCYield;
 import com.sun.tools.javac.tree.JCTree.Tag;
-import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JCDiagnostic;
 import com.sun.tools.javac.util.Log;
@@ -3217,6 +3217,7 @@ private Annotation convert(JCAnnotation javac) {
 				if( expr instanceof JCAssign jcass) {
 					if( jcass.lhs instanceof JCIdent jcid ) {
 						final MemberValuePair pair = new MemberValuePair(this.ast);
+						commonSettings(pair, jcass);
 						final SimpleName simpleName = new SimpleName(this.ast);
 						commonSettings(simpleName, jcid);
 						simpleName.internalSetIdentifier(new String(jcid.getName().toString()));

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacMemberValuePairBinding.java

@@ -85,7 +85,7 @@ public IJavaElement getJavaElement() {
 	public String getKey() {
 		// as of writing, not yet implemented for ECJ
 		// @see org.eclipse.jdt.core.dom.MemberValuePairBinding.getKey
-		return null;
+		return Integer.toString(System.identityHashCode(this.method));
 	}
 
 	@Override

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ExpectedTypes.java

@@ -136,6 +136,16 @@ private void computeExpectedTypes(){
 					return;
 				}
 			}
+			if (parent2.getLocationInParent() == MemberValuePair.VALUE_PROPERTY && parent2.getParent() instanceof MemberValuePair mvp) {
+				var binding = mvp.resolveMemberValuePairBinding();
+				if (binding != null) {
+					var methodBinding = binding.getMethodBinding();
+					if (methodBinding != null) {
+						this.expectedTypes.add(methodBinding.getReturnType());
+						break;
+					}
+				}
+			}
  			parent2 = parent2.getParent();
 		}
 		ASTNode parent = parent2;