Issue #69: resolved removeViolationComments Bug

Author: Anmol202005

src/test/java/org/checkstyle/autofix/RemoveViolationComments.java

@@ -17,9 +17,8 @@
 
 package org.checkstyle.autofix;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
@@ -50,20 +49,30 @@ private static final class ViolationCommentRemover extends JavaIsoVisitor<Execut
         @Override
         public Space visitSpace(Space space, Space.Location loc, ExecutionContext ctx) {
             final StringBuilder suffixAccumulator = new StringBuilder();
+            final List<Comment> filteredComments = new ArrayList<>();
 
-            final List<Comment> filteredComments = space.getComments().stream()
-                    .map(comment -> {
-                        Comment result = comment;
-                        if (!comment.isMultiline() && comment instanceof TextComment) {
-                            final TextComment textComment = (TextComment) comment;
-                            if (textComment.getText().startsWith("violation")) {
-                                suffixAccumulator.append(textComment.getSuffix());
-                                result = null;
-                            }
+            for (Comment comment : space.getComments()) {
+                Comment result = comment;
+                if (!comment.isMultiline() && comment instanceof TextComment) {
+                    final TextComment textComment = (TextComment) comment;
+                    if (textComment.getText().matches("\\s*(\\d+\\s*)?violation.*")) {
+                        if (!filteredComments.isEmpty()) {
+                            final int lastIndex = filteredComments.size() - 1;
+                            final Comment previousComment = filteredComments.get(lastIndex);
+                            filteredComments.set(lastIndex,
+                                    previousComment.withSuffix(textComment.getSuffix()));
                         }
-                        return result; })
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+                        else {
+                            suffixAccumulator.append(textComment.getSuffix());
+                        }
+                        result = null;
+                    }
+                }
+
+                if (result != null) {
+                    filteredComments.add(result);
+                }
+            }
 
             Space result;
 
@@ -73,16 +82,7 @@ public Space visitSpace(Space space, Space.Location loc, ExecutionContext ctx) {
             else {
                 result = space.withComments(filteredComments);
                 if (!suffixAccumulator.isEmpty()) {
-                    if (filteredComments.isEmpty()) {
-                        result = result.withWhitespace(suffixAccumulator.toString());
-                    }
-                    else {
-                        final Comment lastComment = filteredComments
-                                .get(filteredComments.size() - 1);
-                        filteredComments.set(filteredComments.size() - 1,
-                                lastComment.withSuffix(suffixAccumulator.toString()));
-                        result = space.withComments(filteredComments);
-                    }
+                    result = result.withWhitespace(suffixAccumulator.toString());
                 }
             }
             return super.visitSpace(result, loc, ctx);