Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions rewrite-toml/src/main/java/org/openrewrite/toml/DeleteKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@
import org.openrewrite.Option;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.toml.tree.Comment;
import org.openrewrite.toml.tree.Space;
import org.openrewrite.toml.tree.Toml;
import org.openrewrite.toml.tree.TomlRightPadded;

import java.util.ArrayList;
import java.util.List;

@Value
@EqualsAndHashCode(callSuper = false)
Expand All @@ -45,6 +51,46 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
Toml.KeyValue kv = super.visitKeyValue(keyValue, ctx);
return matcher.matches(getCursor()) ? null : kv;
}

@Override
public Toml.Table visitTable(Toml.Table table, ExecutionContext ctx) {
Toml.Table t = table;
t = t.withPrefix(visitSpace(t.getPrefix(), ctx));
t = t.withMarkers(visitMarkers(t.getMarkers(), ctx));

List<TomlRightPadded<Toml>> original = t.getPadding().getValues();
List<TomlRightPadded<Toml>> result = new ArrayList<>(original.size());
boolean changed = false;
boolean prevDeleted = false;

for (TomlRightPadded<Toml> rp : original) {
Toml visited = visit(rp.getElement(), ctx);
if (visited == null) {
prevDeleted = changed = true;
continue;
}
if (prevDeleted) {
visited = visited.withPrefix(
stripInlineCommentFromDeletedLine(visited.getPrefix()));
prevDeleted = false;
}
TomlRightPadded<Toml> newRp = visited == rp.getElement() ? rp : rp.withElement(visited);
if (newRp != rp) changed = true;
result.add(newRp);
}
return changed ? t.getPadding().withValues(result) : t;
}

private Space stripInlineCommentFromDeletedLine(Space prefix) {
List<Comment> comments = prefix.getComments();
if (prefix.getWhitespace().contains("\n") || comments.isEmpty()) {
return prefix;
}
return Space.build(
comments.get(0).getSuffix(),
new ArrayList<>(comments.subList(1, comments.size()))
);
}
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.openrewrite.toml;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.DocumentExample;
import org.openrewrite.test.RewriteTest;
Expand Down Expand Up @@ -225,7 +224,6 @@ void deleteKeyWithArrayValue() {
);
}

@Disabled
@Test
void preserveComments() {
rewriteRun(
Expand Down