From 5e0d9e3d08b3c4dee83059af5c10a6ed07575b26 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Fri, 13 Sep 2024 08:18:21 -0700
Subject: [PATCH] Fix different formatting of block line comments with openjdk
 23+

Fixes #1153.

Fixes #1161

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/google-java-format/pull/1161 from dweiss:1153-block-line-comments-in-java23 e3ed83c6d705589f28565ad6050631394bc75d49
PiperOrigin-RevId: 674304999
---
 .../google/googlejavaformat/java/JavaCommentsHelper.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 d34ecc43f..d54b2317e 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java
@@ -49,7 +49,11 @@ public String rewrite(Tok tok, int maxWidth, int column0) {
     List<String> lines = new ArrayList<>();
     Iterator<String> it = Newlines.lineIterator(text);
     while (it.hasNext()) {
-      lines.add(CharMatcher.whitespace().trimTrailingFrom(it.next()));
+      if (tok.isSlashSlashComment()) {
+        lines.add(CharMatcher.whitespace().trimFrom(it.next()));
+      } else {
+        lines.add(CharMatcher.whitespace().trimTrailingFrom(it.next()));
+      }
     }
     if (tok.isSlashSlashComment()) {
       return indentLineComments(lines, column0);