Lazily resolve DOMCompletionContext.getEnclosingElement()

Author: mickaelistria

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

@@ -1043,6 +1043,12 @@ IBinding resolveName(Name name) {
 
 	private IBinding resolveNameImpl(Name name) {
 		resolve();
+		if (name.getParent() instanceof MemberRef memberRef) {
+			resolveReference(memberRef); // initialize symbols on Javadoc
+		}
+		if (name.getParent() instanceof MethodRef methodRef) {
+			resolveReference(methodRef);
+		}
 
 		// first, prefer parent if appropriate
 		ASTNode parent = name.getParent();

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/codeassist/DOMCompletionContext.java

@@ -51,9 +51,14 @@
 import org.eclipse.jdt.internal.compiler.parser.RecoveryScanner;
 
 class DOMCompletionContext extends CompletionContext {
+
+	private final CompilationUnit domUnit;
+	private final ITypeRoot modelUnit;
 	private final int offset;
 	private final char[] token;
-	private final IJavaElement enclosingElement;
+
+	private IJavaElement enclosingElement;
+	private boolean enclosingElementComputed;
 	private final Supplier<Stream<IBinding>> bindingsAcquirer;
 	final ExpectedTypes expectedTypes;
 	private boolean inJavadoc = false;
@@ -62,6 +67,8 @@ class DOMCompletionContext extends CompletionContext {
 	private boolean isJustAfterStringLiteral;
 
 	DOMCompletionContext(CompilationUnit domUnit, ITypeRoot modelUnit, String textContent, int offset, AssistOptions assistOptions, Bindings bindings) {
+		this.domUnit = domUnit;
+		this.modelUnit = modelUnit;
 		this.textContent = textContent;
 		this.offset = offset;
 		// Use the raw text to walk back the offset to the first non-whitespace spot
@@ -88,7 +95,6 @@ class DOMCompletionContext extends CompletionContext {
 			: previousNodeBeforeWhitespaces; // use previous node
 		this.expectedTypes = new ExpectedTypes(assistOptions, this.node, offset);
 		this.token = tokenBefore(this.textContent).toCharArray();
-		this.enclosingElement = computeEnclosingElement(domUnit, modelUnit);
 		this.bindingsAcquirer = bindings::all;
 		this.isJustAfterStringLiteral = this.node instanceof StringLiteral && this.node.getLength() > 1 && this.offset >= this.node.getStartPosition() + this.node.getLength() && textContent.charAt(this.offset - 1) == '"';
 	}
@@ -175,6 +181,10 @@ public void setInJavadoc(boolean inJavadoc) {
 
 	@Override
 	public IJavaElement getEnclosingElement() {
+		if (!this.enclosingElementComputed) {
+			this.enclosingElement = computeEnclosingElement(domUnit, modelUnit);
+			this.enclosingElementComputed = true;
+		}
 		return this.enclosingElement;
 	}