Fix unused suppressed warnings quick fix counts (#1720)

- add new logic for UnusedSuppressWarningsCleanUp.computeNumberOfFixes()
  that screens the problems for the current literal or returns 1 if
  removing all unused tokens
- fix SuppressWarningsBaseSubProcessor to remove the call to remove
  all instances of current literal since the computeNumberOfFixes()
  call in the clean up will offer an option to do this automatically
- fix the test in QuickFixTest1d8
- fixes #1719

Author: jjohnstn

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UnusedSuppressWarningsCleanUp.java

@@ -22,6 +22,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.StringLiteral;
 
@@ -32,6 +33,8 @@
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.jdt.ui.text.java.IProblemLocation;
 
+import org.eclipse.jdt.internal.ui.text.correction.ProblemLocation;
+
 /**
  * Create fix to remove unnecessary SuppressWarnings
  * @see org.eclipse.jdt.internal.corext.fix.UnusedSuppressWarningsFixCore
@@ -127,8 +130,28 @@ public int computeNumberOfFixes(CompilationUnit compilationUnit) {
 		int result= 0;
 		IProblem[] problems= compilationUnit.getProblems();
 		if (isEnabled(CleanUpConstants.REMOVE_UNNECESSARY_SUPPRESS_WARNINGS))
-			result+= getNumberOfProblems(problems, IProblem.UnusedWarningToken);
+			result+= getNumberOfProblems(problems, compilationUnit);
+
+		return result;
+	}
 
+	private int getNumberOfProblems(IProblem[] problems, CompilationUnit compilationUnit) {
+		int result= 0;
+		if (fLiteral == null) {
+			return 1;
+		}
+		for (IProblem problem : problems) {
+			IProblemLocation location= new ProblemLocation(problem);
+			if (location.getProblemId() == IProblem.UnusedWarningToken) {
+				ASTNode node= location.getCoveringNode(compilationUnit);
+				if (node instanceof StringLiteral literal) {
+					if (literal.getLiteralValue().equals(fLiteral.getLiteralValue())) {
+						result++;
+					}
+				}
+			}
+		}
 		return result;
 	}
+
 }

org.eclipse.jdt.core.manipulation/proposals/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsBaseSubProcessor.java

@@ -245,21 +245,11 @@ public void getRemoveUnusedSuppressWarningProposals(IInvocationContext context,
 			T proposal= createFixCorrectionProposal(fix, cleanUp, IProposalRelevance.REMOVE_ANNOTATION, context);
 			proposals.add(proposal);
 		}
-		fix= UnusedSuppressWarningsFixCore.createAllFix(context.getASTRoot(), literal);
-		if (fix != null) {
-			Map<String, String> options= new Hashtable<>();
-			options.put(CleanUpConstants.REMOVE_UNNECESSARY_SUPPRESS_WARNINGS, CleanUpOptions.TRUE);
-			UnusedSuppressWarningsCleanUp cleanUp= new UnusedSuppressWarningsCleanUp(options);
-			cleanUp.setLiteral(literal);
-			T proposal= createFixCorrectionProposal(fix, cleanUp, IProposalRelevance.REMOVE_ANNOTATION, context);
-			proposals.add(proposal);
-		}
 		fix= UnusedSuppressWarningsFixCore.createAllFix(context.getASTRoot(), null);
 		if (fix != null) {
 			Map<String, String> options= new Hashtable<>();
 			options.put(CleanUpConstants.REMOVE_UNNECESSARY_SUPPRESS_WARNINGS, CleanUpOptions.TRUE);
 			UnusedSuppressWarningsCleanUp cleanUp= new UnusedSuppressWarningsCleanUp(options);
-			cleanUp.setLiteral(literal);
 			T proposal= createFixCorrectionProposal(fix, cleanUp, IProposalRelevance.REMOVE_ANNOTATION, context);
 			proposals.add(proposal);
 		}

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest1d8.java

@@ -3050,7 +3050,6 @@ public boolean simplifyCompoundIf(int x) {
 						return false;
 					}
 
-					@SuppressWarnings("unchecked")
 					public boolean simplifyNLS(String x) {
 						return true;
 					}
@@ -3060,27 +3059,6 @@ public boolean simplifyAll() {
 					}
 				}
 				""";
-
-		String expected3= """
-				package test1;
-				public class E {
-					public boolean simplifyNormal(int x) {
-						return true;
-					}
-
-					public boolean simplifyCompoundIf(int x) {
-						return false;
-					}
-
-					public boolean simplifyNLS(String x) {
-						return true;
-					}
-
-					public boolean simplifyAll() {
-						return false;
-					}
-				}
-				""";
-		assertExpectedExistInProposals(proposals, new String[] {expected1, expected2, expected3});
+		assertExpectedExistInProposals(proposals, new String[] {expected1, expected2});
 	}
 }