From 16aa3b945223b25737725530759e4f5f6af7beee Mon Sep 17 00:00:00 2001 From: Suby S Surendran Date: Sun, 13 Oct 2024 12:50:19 +0530 Subject: [PATCH] Modifications done inside the bodyDeclaration and the issue has fixed. --- .../ASTRewritingRecordDeclarationTest.java | 29 ++++++++++--------- .../eclipse/jdt/core/dom/ASTConverter.java | 1 + .../core/dom/rewrite/ASTRewriteAnalyzer.java | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingRecordDeclarationTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingRecordDeclarationTest.java index e1fbf55ce92..fca4eede84d 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingRecordDeclarationTest.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/rewrite/describing/ASTRewritingRecordDeclarationTest.java @@ -1408,14 +1408,15 @@ public void testRecord_029() throws Exception { } IPackageFragment pack1= this.sourceFolder.createPackageFragment("test1", false, null); - StringBuilder buf= new StringBuilder(); - buf.append("package test1;\n"); - buf.append("record Test(String name) {\n"); - buf.append(" public static Builder builder() {}\n"); - buf.append(" public static final class Builder {}\n"); - buf.append("}\n"); + String code = """ + package test1; + public record Test(String name) { + public static Builder builder() {} + public static final class Builder {} + } + """; - ICompilationUnit cu= pack1.createCompilationUnit("Test.java", buf.toString(), false, null); + ICompilationUnit cu= pack1.createCompilationUnit("Test.java", code, false, null); CompilationUnit astRoot= createAST(cu); ASTRewrite rewrite= ASTRewrite.create(astRoot.getAST()); @@ -1429,14 +1430,14 @@ public void testRecord_029() throws Exception { String preview= evaluateRewrite(cu, rewrite); - buf = new StringBuilder(); - buf.append("package test1;\n"); - buf.append("record Test(String name) {\n"); - buf.append(" \n"); - buf.append(" public static final class Builder {}\n"); - buf.append("}\n"); + String reWriteCode = """ + package test1; + public record Test(String name) { + public static final class Builder {} + } + """; - assertEqualString(preview, buf.toString()); + assertEqualString(preview, reWriteCode); } } diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java index e6299685ec0..7ab2da38686 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java @@ -315,6 +315,7 @@ protected void buildBodyDeclarations( } else { methodsIndex++; + continue; } } diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java index bfdca312ee6..76c09181b52 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java @@ -393,7 +393,7 @@ final void addEditGroup(TextEditGroup editGroup, TextEdit edit) { } final TextEdit doTextRemove(int offset, int len, TextEditGroup editGroup) { - if (len <= 0) { + if (len == 0) { return null; } TextEdit edit= new DeleteEdit(offset, len);