Fix add final for fields cleanup for generic class and lambda (#2493)

- fix VariableDeclarationFixCore.fieldCanBeFinal() method to
  add call to IVariableBinding.getVariableDeclaration() in
  lambda visitor because reference to the field in lambda will
  be ParameterizedFieldBinding and will not be equal to original
  generic field binding
- add new test to CleanUpTest
- fixes #2492

Author: jjohnstn

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/VariableDeclarationFixCore.java

@@ -300,7 +300,7 @@ public boolean visit(LambdaExpression lambda) {
 								@Override
 								public boolean visit(SimpleName name) {
 									IBinding nameBinding= name.resolveBinding();
-									if (nameBinding == null || (nameBinding instanceof IVariableBinding varBinding && varBinding.isEqualTo(binding))) {
+									if (nameBinding == null || (nameBinding instanceof IVariableBinding varBinding && varBinding.getVariableDeclaration().isEqualTo(binding))) {
 										throw new SearchException();
 									}
 									return false;

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

@@ -28046,6 +28046,52 @@ public void foo() {
 		assertRefactoringHasNoChangeEventWithError(new ICompilationUnit[] {cu1});
 	}
 
+	@Test
+	public void testAddFinalIssue2492() throws Exception {
+		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);
+		String sample= """
+			package test;
+			public class E<R> {
+				interface K {
+					void run();
+				}
+				private R key;
+
+				private K k = () -> {
+					System.out.println(key);
+				};
+
+				public FinalIssue(R key) {
+					this.key= key;
+				}
+			}
+			""";
+		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", sample, false, null);
+
+		enable(CleanUpConstants.VARIABLE_DECLARATIONS_USE_FINAL);
+		enable(CleanUpConstants.VARIABLE_DECLARATIONS_USE_FINAL_PRIVATE_FIELDS);
+
+		String expected= """
+				package test;
+				public class E<R> {
+					interface K {
+						void run();
+					}
+					private R key;
+
+					private final K k = () -> {
+						System.out.println(key);
+					};
+
+					public FinalIssue(R key) {
+						this.key= key;
+					}
+				}
+				""";
+
+		assertRefactoringResultAsExpected(new ICompilationUnit[] {cu1}, new String[] {expected}, null);
+	}
+
 	@Test
 	public void testAddFinalBug129807() throws Exception {
 		IPackageFragment pack1= fSourceFolder.createPackageFragment("test", false, null);