Support more places

CsCherrYY · CsCherrYY · commit 1ed1d874af47 · 2021-08-31T22:31:43.000+08:00
Signed-off-by: Shi Chen &lt;chenshi@microsoft.com&gt;
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/SourceAssistProcessor.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/SourceAssistProcessor.java
@@ -22,6 +22,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import com.google.common.collect.Sets;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -34,9 +36,11 @@
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.Statement;
+import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.manipulation.CoreASTProvider;
 import org.eclipse.jdt.core.manipulation.OrganizeImportsOperation;
@@ -77,8 +81,6 @@
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.text.edits.TextEdit;
 
-import com.google.common.collect.Sets;
-
 public class SourceAssistProcessor {
 
 	private static final Set<String> UNSUPPORTED_RESOURCES = Sets.newHashSet("module-info.java", "package-info.java");
@@ -146,9 +148,18 @@ public List<Either<Command, CodeAction>> getSourceActionCommands(CodeActionParam
 			if (node == null) {
 				node = context.getCoveringNode();
 			}
-			if (node instanceof SimpleName) {
-				ASTNode parent = node.getParent();
-				if (parent instanceof TypeDeclaration) {
+			ASTNode declarationNode = getDeclarationNode(node);
+			if (declarationNode instanceof TypeDeclaration) {
+				TypeDeclaration typeDeclaration = (TypeDeclaration)declarationNode;
+				List<ASTNode> candidates = new ArrayList<>();
+				Type superType = typeDeclaration.getSuperclassType();
+				if (superType != null) {
+					candidates.add(superType);
+				}
+				candidates.add(typeDeclaration.getName());
+				candidates.addAll(typeDeclaration.modifiers());
+				candidates.addAll(typeDeclaration.superInterfaceTypes());
+				if (isCovered(node, candidates)) {
 					quickAssistHashCodeEquals = getHashCodeEqualsAction(params, JavaCodeActionKind.QUICK_ASSIST);
 					addSourceActionCommand($, params.getContext(), quickAssistHashCodeEquals);
 				}
@@ -574,4 +585,27 @@ public static ICompilationUnit getCompilationUnit(CodeActionParams params) {
 		return JDTUtils.resolveCompilationUnit(params.getTextDocument().getUri());
 	}
 
+	private static ASTNode getDeclarationNode(ASTNode node) {
+		if (node == null) {
+			return null;
+		}
+		if (node instanceof BodyDeclaration) {
+			return null;
+		}
+		while (node != null && !(node instanceof BodyDeclaration) && !(node instanceof Statement)) {
+			node = node.getParent();
+		}
+		return node;
+	}
+
+	private static boolean isCovered(ASTNode node, List<ASTNode> candidates) {
+		int startPosition = node.getStartPosition();
+		int endPosition = startPosition + node.getLength();
+		for (ASTNode candidate : candidates) {
+			if (startPosition >= candidate.getStartPosition() && endPosition <= candidate.getStartPosition() + candidate.getLength()) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
