Fix add block to handle if expressions over multiple lines (eclipse-jdt#2065)

- add logic to ControlStatementsFix to look at the last line
  of the expression instead of the if statement start
- add new test to CleanUpTest
- fixes eclipse-jdt#2060

Author: jjohnstn

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

@@ -224,7 +224,8 @@ public void rewriteASTInternal(CompilationUnitRewrite cuRewrite, LinkedProposalM
 
 			TextEditGroup group= createTextEditGroup(label, cuRewrite);
 			List<Comment> commentsToPreserve= new ArrayList<>();
-			int controlStatementLine= cuRoot.getLineNumber(fControlStatement.getStartPosition());
+			int startPosition= expression == null ? defaultStartPosition : (expression.getStartPosition() + cuRoot.getExtendedLength(expression));
+			int controlStatementLine= cuRoot.getLineNumber(startPosition);
 			int bodyLine= cuRoot.getLineNumber(fBody.getStartPosition());
 			IBuffer cuBuffer= cuRewrite.getCu().getBuffer();
 			// Get extended body text and convert multiple indent tabs to be just one tab as they will be relative to control statement
@@ -235,7 +236,6 @@ public void rewriteASTInternal(CompilationUnitRewrite cuRewrite, LinkedProposalM
 			// If single body statement is on next line, we need to preserve any comments pertaining to the
 			// control statement (e.g. NLS comment for if expression)
 			if (controlStatementLine != bodyLine) {
-				int startPosition= expression == null ? defaultStartPosition : (expression.getStartPosition() + cuRoot.getExtendedLength(expression));
 				List<Comment> comments= cuRoot.getCommentList();
 				for (Comment comment : comments) {
 					int commentLine= cuRoot.getLineNumber(comment.getStartPosition());

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

@@ -20651,6 +20651,41 @@ public void foo(String x) {
 		assertRefactoringResultAsExpected(new ICompilationUnit[] {cu1}, new String[] {expected1}, null);
 	}
 
+	@Test
+	public void testAddParenthesesIssue2060() throws Exception {
+
+		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
+		String sample= """
+			package test1;
+			public class E {
+				public void foo(String x) {
+					if (x.equals("abc") || //$NON-NLS-1$
+					        x.equals("def")) //$NON-NLS-1$
+					    System.out.println("def"); //$NON-NLS-1$
+				}
+			}
+			""";
+		ICompilationUnit cu1= pack1.createCompilationUnit("E.java", sample, false, null);
+
+		enable(CleanUpConstants.CONTROL_STATEMENTS_USE_BLOCKS);
+		enable(CleanUpConstants.CONTROL_STATEMENTS_USE_BLOCKS_ALWAYS);
+
+		sample= """
+			package test1;
+			public class E {
+				public void foo(String x) {
+					if (x.equals("abc") || //$NON-NLS-1$
+					        x.equals("def")) { //$NON-NLS-1$
+			        \tSystem.out.println("def"); //$NON-NLS-1$
+			        }
+				}
+			}
+			""";
+		String expected1= sample;
+
+		assertRefactoringResultAsExpected(new ICompilationUnit[] {cu1}, new String[] {expected1}, null);
+	}
+
 	@Test
 	public void testRemoveParentheses01() throws Exception {