Skip to content

Commit

Permalink
Merge branch 'dom-with-javac' into jinbo_apsource
Browse files Browse the repository at this point in the history
  • Loading branch information
@testforstephen
testforstephen authored Oct 10, 2024
2 parents a9019cf + 5f07272 commit 68767b5
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 21 deletions.
83 changes: 69 additions & 14 deletions org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.CompletionProposal;
import org.eclipse.jdt.core.CompletionRequestor;
import org.eclipse.jdt.core.Flags;
Expand All @@ -44,6 +45,7 @@
import org.eclipse.jdt.core.dom.Block;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.ExpressionStatement;
import org.eclipse.jdt.core.dom.FieldAccess;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.IBinding;
Expand Down Expand Up @@ -107,6 +109,7 @@ public class DOMCompletionEngine implements Runnable {
private ASTNode toComplete;
private final DOMCompletionEngineVariableDeclHandler variableDeclHandler;
private final DOMCompletionEngineRecoveredNodeScanner recoveredNodeScanner;
private final IProgressMonitor monitor;

static class Bindings {
private HashSet<IMethodBinding> methods = new HashSet<>();
Expand Down Expand Up @@ -166,6 +169,7 @@ public DOMCompletionEngine(int offset, CompilationUnit domUnit, ICompilationUnit
this.nestedEngine = new CompletionEngine(this.nameEnvironment, this.requestor, this.modelUnit.getOptions(true), this.modelUnit.getJavaProject(), workingCopyOwner, monitor);
this.variableDeclHandler = new DOMCompletionEngineVariableDeclHandler();
this.recoveredNodeScanner = new DOMCompletionEngineRecoveredNodeScanner(modelUnit, offset);
this.monitor = monitor;
}

private Collection<? extends IBinding> visibleBindings(ASTNode node) {
Expand Down Expand Up @@ -232,8 +236,11 @@ public void run() {
boolean suggestPackageCompletions = true;
boolean suggestDefaultCompletions = true;

checkCancelled();

if (context instanceof FieldAccess fieldAccess) {
computeSuitableBindingFromContext = false;
statementLikeKeywords();
processMembers(fieldAccess.getExpression().resolveTypeBinding(), scope, true, isNodeInStaticContext(fieldAccess));
if (scope.stream().findAny().isPresent()) {
scope.stream()
Expand Down Expand Up @@ -403,6 +410,7 @@ public void acceptConstructor(int modifiers, char[] simpleTypeName, int paramete
}
current = current.getParent();
}
statementLikeKeywords();
publishFromScope(scope);
if (!completeAfter.isBlank()) {
final int typeMatchRule = this.toComplete.getParent() instanceof Annotation
Expand All @@ -414,7 +422,7 @@ public void acceptConstructor(int modifiers, char[] simpleTypeName, int paramete
.map(this::toProposal).forEach(this.requestor::accept);
}
}

checkCancelled();
// this handle where we complete inside a expressions like
// Type type = new Type(); where complete after "Typ", since completion should support all type completions
// we should not return from this block at the end.
Expand All @@ -438,9 +446,59 @@ public void acceptConstructor(int modifiers, char[] simpleTypeName, int paramete
} catch (JavaModelException ex) {
ILog.get().error(ex.getMessage(), ex);
}
checkCancelled();
this.requestor.endReporting();
}

private void checkCancelled() {
if (this.monitor != null && this.monitor.isCanceled()) {
throw new OperationCanceledException();
}
}

private void statementLikeKeywords() {
List<char[]> keywords = new ArrayList<>();
keywords.add(Keywords.ASSERT);
keywords.add(Keywords.RETURN);
if (findParent(this.toComplete,
new int[] { ASTNode.WHILE_STATEMENT, ASTNode.DO_STATEMENT, ASTNode.FOR_STATEMENT }) != null) {
keywords.add(Keywords.BREAK);
keywords.add(Keywords.CONTINUE);
}
ExpressionStatement exprStatement = (ExpressionStatement) findParent(this.toComplete, new int[] {ASTNode.EXPRESSION_STATEMENT});
if (exprStatement != null) {

ASTNode statementParent = exprStatement.getParent();
if (statementParent instanceof Block block) {
int exprIndex = block.statements().indexOf(exprStatement);
if (exprIndex > 0) {
ASTNode prevStatement = (ASTNode)block.statements().get(exprIndex - 1);
if (prevStatement.getNodeType() == ASTNode.IF_STATEMENT) {
keywords.add(Keywords.ELSE);
}
}
}
}
for (char[] keyword : keywords) {
if (!isFailedMatch(this.toComplete.toString().toCharArray(), keyword)) {
this.requestor.accept(createKeywordProposal(keyword, this.toComplete.getStartPosition(), this.offset));
}
}
}

private static ASTNode findParent(ASTNode nodeToSearch, int[] kindsToFind) {
ASTNode cursor = nodeToSearch;
while (cursor != null) {
for (int kindToFind : kindsToFind) {
if (cursor.getNodeType() == kindToFind) {
return cursor;
}
}
cursor = cursor.getParent();
}
return null;
}

private void completeMarkerAnnotation(String completeAfter) {
findTypes(completeAfter, IJavaSearchConstants.ANNOTATION_TYPE, null)
.filter(type -> this.pattern.matchesName(this.prefix.toCharArray(),
Expand Down Expand Up @@ -507,9 +565,9 @@ private void findOverridableMethods0(ITypeBinding typeBinding, Set<String> alrea
proposal.setTypeName(method.getReturnType().getName().toCharArray());
proposal.setDeclarationPackageName(typeBinding.getPackage().getName().toCharArray());
proposal.setDeclarationTypeName(typeBinding.getQualifiedName().toCharArray());
proposal.setDeclarationSignature(DOMCompletionEngineBuilder.getSignature(method.getDeclaringClass()).toCharArray());
proposal.setDeclarationSignature(DOMCompletionEngineBuilder.getSignature(method.getDeclaringClass()));
proposal.setKey(method.getKey().toCharArray());
proposal.setSignature(DOMCompletionEngineBuilder.getSignature(method).toCharArray());
proposal.setSignature(DOMCompletionEngineBuilder.getSignature(method));
proposal.setParameterNames(Stream.of(method.getParameterNames()).map(name -> name.toCharArray()).toArray(char[][]::new));

int relevance = RelevanceConstants.R_DEFAULT
Expand Down Expand Up @@ -624,10 +682,7 @@ private CompletionProposal toProposal(IBinding binding, String completion) {
res.setParameterNames(paramNames.stream().map(String::toCharArray).toArray(i -> new char[i][]));
}
res.setParameterTypeNames(Stream.of(methodBinding.getParameterNames()).map(String::toCharArray).toArray(char[][]::new));
res.setSignature(methodBinding.getKey().replace('/', '.').toCharArray());
res.setReceiverSignature(Signature
.createTypeSignature(methodBinding.getDeclaringClass().getQualifiedName().toCharArray(), true)
.toCharArray());
res.setSignature(DOMCompletionEngineBuilder.getSignature(methodBinding));
res.setDeclarationSignature(Signature
.createTypeSignature(methodBinding.getDeclaringClass().getQualifiedName().toCharArray(), true)
.toCharArray());
Expand Down Expand Up @@ -697,8 +752,10 @@ private CompletionProposal toProposal(IBinding binding, String completion) {
binding instanceof IMethodBinding methodBinding ? methodBinding.getReturnType() :
binding instanceof IVariableBinding variableBinding ? variableBinding.getType() :
this.toComplete.getAST().resolveWellKnownType(Object.class.getName())) +
CompletionEngine.computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE) + //no access restriction for class field
CompletionEngine.R_NON_INHERITED);
RelevanceConstants.R_UNQUALIFIED + // TODO: add logic
CompletionEngine.computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE) //no access restriction for class field
//RelevanceConstants.R_NON_INHERITED // TODO: when is this active?
);
return res;
}

Expand Down Expand Up @@ -786,7 +843,7 @@ private int computeRelevanceForExpectingType(ITypeBinding proposalType){
int relevance = 0;
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=271296
// If there is at least one expected type, then void proposal types attract a degraded relevance.
if (PrimitiveType.VOID.toString().equals(proposalType.getName())) {
if (!this.expectedTypes.getExpectedTypes().isEmpty() && PrimitiveType.VOID.toString().equals(proposalType.getName())) {
return RelevanceConstants.R_VOID;
}
for (ITypeBinding expectedType : this.expectedTypes.getExpectedTypes()) {
Expand Down Expand Up @@ -948,10 +1005,8 @@ private CompletionProposal createKeywordProposal(char[] keyword, int startPos, i
int relevance = RelevanceConstants.R_DEFAULT
+ RelevanceConstants.R_RESOLVED
+ RelevanceConstants.R_INTERESTING
+ RelevanceConstants.R_NON_RESTRICTED;
if (!isFailedMatch(this.prefix.toCharArray(), keyword)) {
relevance += RelevanceConstants.R_SUBSTRING;
}
+ RelevanceConstants.R_NON_RESTRICTED
+ CompletionEngine.computeRelevanceForCaseMatching(this.prefix.toCharArray(), keyword, this.assistOptions);
CompletionProposal keywordProposal = createProposal(CompletionProposal.KEYWORD);
keywordProposal.setCompletion(keyword);
keywordProposal.setName(keyword);
Expand Down
10 changes: 6 additions & 4 deletions ...e.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngineBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,14 @@ static void createTypeVariable(ITypeBinding typeVariable, StringBuilder completi
}
}

static String getSignature(IMethodBinding methodBinding) {
return methodBinding.getKey().replace('/', '.');
static char[] getSignature(IMethodBinding methodBinding) {
String fullKey = methodBinding.getKey().replace('/', '.');
String justReturn = fullKey.substring(fullKey.indexOf('('));
return justReturn.toCharArray();
}

static String getSignature(ITypeBinding methodBinding) {
return methodBinding.getKey().replace('/', '.');
static char[] getSignature(ITypeBinding typeBinding) {
return typeBinding.getKey().replace('/', '.').toCharArray();
}

}
10 changes: 7 additions & 3 deletions org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ExpectedTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.eclipse.jdt.core.dom.Assignment;
import org.eclipse.jdt.core.dom.CastExpression;
import org.eclipse.jdt.core.dom.ClassInstanceCreation;
import org.eclipse.jdt.core.dom.DoStatement;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.ForStatement;
import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
Expand Down Expand Up @@ -227,6 +228,8 @@ else if (scope instanceof ClassScope)
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.SHORT.toString()));
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.INT.toString()));
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.LONG.toString()));
} else if (parent instanceof DoStatement) {
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.BOOLEAN.toString()));
} // TODO port next code to IBinding
/*else if(parent instanceof ParameterizedSingleTypeReference ref) {
ITypeBinding expected = null;
Expand Down Expand Up @@ -391,9 +394,10 @@ else if (scope instanceof ClassScope)
if (assertStatement.getExpression() == this.node) {
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.BOOLEAN.toString()));
}
} else if (parent instanceof ForStatement) { // astNodeParent set to ForStatement only for the condition
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.BOOLEAN.toString()));

} else if (parent instanceof ForStatement forStatement) {
if (forStatement.getExpression().equals(this.node)) {
this.expectedTypes.add(this.node.getAST().resolveWellKnownType(PrimitiveType.BOOLEAN.toString()));
}
} else if (parent instanceof Javadoc) { // Expected types for javadoc
findMethod(parent)
.map(MethodDeclaration::resolveBinding)
Expand Down

0 comments on commit 68767b5

Please sign in to comment.