Fix trailing tab logic for converting to Text Block (#1244)

- fix StringConcatToTextBlockFixCore.escapeTrailingWhitespace() method - add new test to CleanUpTest15 - fixes #1240
eclipse-jdt · Mar 8, 2024 · 43c8c66 · 43c8c66
1 parent 9e6e796
commit 43c8c66
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...on/core extension/org/eclipse/jdt/internal/corext/fix/StringConcatToTextBlockFixCore.java b/...on/core extension/org/eclipse/jdt/internal/corext/fix/StringConcatToTextBlockFixCore.java
@@ -405,12 +405,12 @@ private static String escapeTrailingWhitespace(String unescaped) {
 			if (unescaped.charAt(whitespaceStart) == ' ') {
 				whitespaceStart--;
 				trailingWhitespace.append("\\s"); //$NON-NLS-1$
+				continue;
 			} else if (unescaped.charAt(whitespaceStart) == '\t') {
 				whitespaceStart--;
 				trailingWhitespace.append("\\t"); //$NON-NLS-1$
-			} else {
-				break;
 			}
+			break;
 		}
 
 		return unescaped.substring(0, whitespaceStart + 1) + trailingWhitespace;

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest15.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest15.java
@@ -109,6 +109,12 @@ public void testConcatToTextBlock() throws Exception {
     	        + "    }\n" //
     	        + "    public void testConcatInConstructor() {\n" //
     	        + "        new StringBuffer(\"abc\\n\" + \"def\\n\" + \"ghi\");\n" //
+    	        + "    }\n" //
+    	        + "    public void testTabStart() {\n" //
+    	        + "        String x =\"\\tif (true) {\\n\" +\n" //
+    	        + "                \"\\t\\tstuff();\\n\" +\n" //
+    	        + "                \"\\t} else\\n\" +\n" //
+    	        + "                \"\\t\\tnoStuff\";\n" //
     	        + "    }\n" //
 				+ "}\n";
 
@@ -182,7 +188,14 @@ public void testConcatToTextBlock() throws Exception {
     	        + "            def\n" //
     	        + "            ghi\"\"\");\n" //
     	        + "    }\n" //
-				+ "}\n";
+    	        + "    public void testTabStart() {\n" //
+    	        + "        String x =\"\"\"\n" //
+    	        + "            \tif (true) {\n" //
+    	        + "            \t\tstuff();\n" //
+    	        + "            \t} else\n" //
+    	        + "            \t\tnoStuff\"\"\";\n" //
+    	        + "    }\n" //
+    	        + "}\n";
 
 		assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1 }, new String[] { expected1 }, null);
 	}