Respond to PR feedback

Signed-off-by: Rob Stryker <rob@oxbeef.net>
robstryker · Feb 1, 2024 · ea354ef · ea354ef
1 parent 76f337b
commit ea354ef
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/...e/src/org/eclipse/jdt/ls/core/internal/corrections/proposals/JavadocTagsSubProcessor.java b/...e/src/org/eclipse/jdt/ls/core/internal/corrections/proposals/JavadocTagsSubProcessor.java
@@ -20,9 +20,13 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.Javadoc;
 import org.eclipse.jdt.core.dom.ModuleDeclaration;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
+import org.eclipse.jdt.internal.core.manipulation.dom.ASTResolving;
+import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.ui.text.correction.AddAllMissingJavadocTagsProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.AddJavadocCommentProposalCore;
 import org.eclipse.jdt.internal.ui.text.correction.AddMissingJavadocTagProposalCore;
@@ -68,6 +72,18 @@ public ASTNode getCoveringNode(CompilationUnit astRoot) {
 		}
 	}
 
+	@Override
+	public void addMissingJavadocTagProposals(IInvocationContextCore context, ASTNode node, Collection<ProposalKindWrapper> proposals) {
+		ASTNode node2 = ASTNodes.getNormalizedNode(node);
+		BodyDeclaration bodyDeclaration = ASTResolving.findParentBodyDeclaration(node2);
+		if (bodyDeclaration != null) {
+			Javadoc javadoc = bodyDeclaration.getJavadoc();
+			if (javadoc != null) {
+				super.addMissingJavadocTagProposals(context, node, proposals);
+			}
+		}
+	}
+
 	public static void getRemoveJavadocTagProposals(IInvocationContextCore context, IProblemLocationCore problem,
 			Collection<ProposalKindWrapper> proposals) {
 		new JavadocTagsSubProcessor().addRemoveJavadocTagProposals(context, problem, proposals);

diff --git a/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistProcessor.java b/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistProcessor.java
@@ -928,12 +928,7 @@ public static boolean getTryWithResourceProposals(IProblemLocationCore[] locatio
 	}
 
 	public static boolean problemExists(IProblemLocationCore[] locations, List<Integer> problems) {
-		for (IProblemLocationCore location : locations) {
-			if (problems.contains(location.getProblemId())) {
-				return true;
-			}
-		}
-		return false;
+		return findProblemLocation(locations, problems) != null;
 	}
 
 	public static IProblemLocationCore findProblemLocation(IProblemLocationCore[] locations, List<Integer> problems) {