From 67ff3b018b634e359a5d60e3457fa567f151be3f Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Sun, 1 Sep 2024 22:07:34 +0200
Subject: [PATCH] Allow "remove abstract" quickfix for BodyForAbstractMethod

When using Javac, the BodyForAbstractMethod problem is well reported.
Other problems can be missing.
However, BodyForAbstractMethod seems like a good enough case per so to
enable the "remove abstract" quick fix.

This fixes AbstractMethodQuickFixTest.testAbstractMethodInConcreteClass
when running with Javac.
---
 .../correction/ModifierCorrectionSubProcessor.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/ModifierCorrectionSubProcessor.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/ModifierCorrectionSubProcessor.java
index e3ea815f6b..6952f7b033 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/ModifierCorrectionSubProcessor.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/ModifierCorrectionSubProcessor.java
@@ -68,8 +68,6 @@
 import org.eclipse.jdt.internal.corext.fix.UnimplementedCodeFixCore.MakeTypeAbstractOperation;
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.corext.util.JdtFlags;
-import org.eclipse.jdt.ui.text.java.IInvocationContext;
-import org.eclipse.jdt.ui.text.java.IProblemLocation;
 import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.FixCorrectionProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.proposals.ModifierChangeCorrectionProposalCore;
@@ -79,6 +77,8 @@
 import org.eclipse.jdt.ls.core.internal.corrections.ProposalKindWrapper;
 import org.eclipse.jdt.ls.core.internal.corrections.proposals.UnresolvedElementsSubProcessor;
 import org.eclipse.jdt.ls.core.internal.handlers.CodeActionHandler;
+import org.eclipse.jdt.ui.text.java.IInvocationContext;
+import org.eclipse.jdt.ui.text.java.IProblemLocation;
 import org.eclipse.jdt.ui.text.java.correction.ASTRewriteCorrectionProposalCore;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -541,7 +541,7 @@ public static void addAbstractMethodProposals(IInvocationContext context, IProbl
 		boolean hasNoBody = decl.getBody() == null;
 
 		int id = problem.getProblemId();
-		if (id == IProblem.AbstractMethodInAbstractClass || id == IProblem.EnumAbstractMethodMustBeImplemented || id == IProblem.AbstractMethodInEnum || parentIsAbstractClass) {
+		if (id == IProblem.AbstractMethodInAbstractClass || id == IProblem.EnumAbstractMethodMustBeImplemented || id == IProblem.AbstractMethodInEnum || id == IProblem.BodyForAbstractMethod || parentIsAbstractClass) {
 			AST ast = astRoot.getAST();
 			ASTRewrite rewrite = ASTRewrite.create(ast);
 
@@ -981,10 +981,10 @@ public static void addSealedMissingModifierProposal(IInvocationContext context,
 		if (!(selectedNode instanceof SimpleName)) {
 			return;
 		}
-		if (!(((SimpleName) selectedNode).getParent() instanceof TypeDeclaration)) {
+		if (!(selectedNode.getParent() instanceof TypeDeclaration)) {
 			return;
 		}
-		TypeDeclaration typeDecl = (TypeDeclaration) ((SimpleName) selectedNode).getParent();
+		TypeDeclaration typeDecl = (TypeDeclaration) selectedNode.getParent();
 		boolean isInterface = typeDecl.isInterface();
 
 		ICompilationUnit cu = context.getCompilationUnit();