From 74e1e4c28814b958637528d28d40748da079f5ee Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Wed, 26 Mar 2025 20:50:03 +0100 Subject: [PATCH 1/2] Preserve markdown-like comments. --- .../google/googlejavaformat/java/JavaCommentsHelper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java index 9526b892..e0b4b015 100644 --- a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java +++ b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java @@ -55,6 +55,13 @@ public String rewrite(Tok tok, int maxWidth, int column0) { lines.add(CharMatcher.whitespace().trimTrailingFrom(it.next())); } } + + // Crude but works. Don't touch markdown-like line comments, even if they're + // somewhere in the code (and are not markdown). + if (lines.stream().allMatch(line -> line.startsWith("///"))) { + return preserveIndentation(lines, column0); + } + if (tok.isSlashSlashComment()) { return indentLineComments(lines, column0); } From 75722a6afc0d376979d18306e5067b4db9cb0a53 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Thu, 27 Mar 2025 08:07:48 +0100 Subject: [PATCH 2/2] Fixing one test that fails after the markdown-comment-preserve correction. --- .../com/google/googlejavaformat/java/testdata/B38241237.output | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output index 3dcebb13..ed3e5b33 100644 --- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B38241237.output @@ -3,6 +3,6 @@ class B38241237 { // bar // one long incredibly unbroken sentence moving from topic to topic so that no-one had a chance to // interrupt - /// baz + ///baz //// }