From 8cbfa94825f239959251b7d618cce03e87cfa990 Mon Sep 17 00:00:00 2001 From: Rob Stryker Date: Wed, 31 Jan 2024 23:59:37 -0500 Subject: [PATCH] Respond to PR feedback Signed-off-by: Rob Stryker --- .../proposals/JavadocTagsSubProcessor.java | 16 ++++++++++++++++ .../text/correction/QuickAssistProcessor.java | 7 +------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/proposals/JavadocTagsSubProcessor.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/proposals/JavadocTagsSubProcessor.java index 14bf7acddb..1d7b9c0a97 100644 --- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/proposals/JavadocTagsSubProcessor.java +++ b/org.eclipse.jdt.ls.core/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 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 proposals) { new JavadocTagsSubProcessor().addRemoveJavadocTagProposals(context, problem, proposals); diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistProcessor.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistProcessor.java index 8e8fbc2858..622bf1dd93 100644 --- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/text/correction/QuickAssistProcessor.java +++ b/org.eclipse.jdt.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 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 problems) {