Skip to content

Commit 6498690

Browse files
java-team-github-botgoogle-java-format Team
authored andcommitted
Automated rollback of commit 5f7a569.
## Reason for rollback Breaks gws.all Search Release TAP Project Target `//java/com/google/gws/common/impl/geo/antiscraping:antiscraping_class_unloading_test` is currently failing at head, this rollback fixes the failure. [] following[] Triage bug: [b/572843931](http://b/572843931) ## Evidence & Verification Matrix | Check | Target State | Result | Sponge / Evidence | | :--- | :--- | :--- | :--- | | 1. HEAD Verification | main @ HEAD | FAILED | http://sponge2/6275dedb-582f-4274-8ef7-dd3efc981c61 | | 2. Rollback Verification | HEAD with 5f7a569 rolled back | PASSED | http://sponge2/1b1b55fd-62f8-49d9-ac66-7bd2df83e6a1 | | 3. Pre-Culprit State | main @ unknown commit | PASSED | Build Rabbit: passed at unknown commit | | 4. Culprit Introduction | main @ 5f7a569 | FAILED | Build Rabbit: failed at 5f7a569 | Search Build Monitor team members can access the jetski conversation for this agent at [] Full triage log (agent conversation and triage script output): [] ## Original change description ``` Overall LGTM: true Reviewers: lizlooney (approved) Support value classes and value records in google-java-format. Recognize the `value` contextual modifier in `JavaInputAstVisitor` and `ModifierOrderer` when formatting Project Valhalla value classes and value records on JDKs that support them. PiperOrigin-RevId: 998098498
1 parent 5f7a569 commit 6498690

4 files changed

Lines changed: 2 additions & 52 deletions

File tree

‎core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,8 +2643,7 @@ private static boolean isModifier(String token) {
26432643
"default",
26442644
"sealed",
26452645
"non",
2646-
"-",
2647-
"value" ->
2646+
"-" ->
26482647
true;
26492648
default -> false;
26502649
};

‎core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.common.base.Preconditions.checkState;
2020
import static com.google.common.collect.Iterables.getLast;
2121

22-
import com.google.common.base.Enums;
2322
import com.google.common.collect.ImmutableList;
2423
import com.google.common.collect.Ordering;
2524
import com.google.common.collect.Range;
@@ -185,7 +184,7 @@ private static void addTrivia(StringBuilder replacement, ImmutableList<? extends
185184
if (modifier == null) {
186185
return null;
187186
}
188-
return Enums.getIfPresent(Modifier.class, "NON_" + modifier.name()).orNull();
187+
return Modifier.valueOf("NON_" + modifier.name());
189188
}
190189

191190
/**
@@ -214,7 +213,6 @@ private static void addTrivia(StringBuilder replacement, ImmutableList<? extends
214213
default ->
215214
switch (token.getTok().getText()) {
216215
case "sealed" -> Modifier.SEALED;
217-
case "value" -> Enums.getIfPresent(Modifier.class, "VALUE").orNull();
218216
default -> null;
219217
};
220218
};

‎core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
import static com.google.common.truth.Truth.assertThat;
1818
import static com.google.common.truth.Truth.assertWithMessage;
19-
import static com.google.common.truth.TruthJUnit.assume;
2019
import static java.nio.charset.StandardCharsets.UTF_8;
2120
import static org.junit.Assert.assertThrows;
2221

23-
import com.google.common.base.Enums;
2422
import com.google.common.io.CharStreams;
2523
import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
2624
import java.io.ByteArrayInputStream;
@@ -31,7 +29,6 @@
3129
import java.io.StringWriter;
3230
import java.nio.file.Files;
3331
import java.nio.file.Path;
34-
import javax.lang.model.element.Modifier;
3532
import org.junit.Rule;
3633
import org.junit.Test;
3734
import org.junit.rules.TemporaryFolder;
@@ -872,38 +869,4 @@ public void maxLineLengthOutOfRange() {
872869

873870
assertThat(Style.builder().maxLineLength(999).build().maxLineLength()).isEqualTo(999);
874871
}
875-
876-
@Test
877-
public void valueClassAndRecord() throws Exception {
878-
assume().that(Enums.getIfPresent(Modifier.class, "VALUE").isPresent()).isTrue();
879-
String input =
880-
"""
881-
value final public class PointValueClass {
882-
final int x;
883-
final int y;
884-
885-
PointValueClass(int x, int y) {
886-
this.x = x;
887-
this.y = y;
888-
}
889-
}
890-
891-
value public record PointValueRecord(int x, int y) {}
892-
""";
893-
String expected =
894-
"""
895-
public final value class PointValueClass {
896-
final int x;
897-
final int y;
898-
899-
PointValueClass(int x, int y) {
900-
this.x = x;
901-
this.y = y;
902-
}
903-
}
904-
905-
public value record PointValueRecord(int x, int y) {}
906-
""";
907-
assertThat(new Formatter().formatSource(input)).isEqualTo(expected);
908-
}
909872
}

‎core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717
package com.google.googlejavaformat.java;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static com.google.common.truth.TruthJUnit.assume;
2120

22-
import com.google.common.base.Enums;
2321
import com.google.common.collect.Range;
2422
import java.util.Arrays;
25-
import javax.lang.model.element.Modifier;
2623
import org.junit.Test;
2724
import org.junit.runner.RunWith;
2825
import org.junit.runners.JUnit4;
@@ -111,11 +108,4 @@ public void sealedClass() throws FormatterException {
111108
assertThat(ModifierOrderer.reorderModifiers("non-sealed sealed public").getText())
112109
.isEqualTo("public sealed non-sealed");
113110
}
114-
115-
@Test
116-
public void valueClass() throws FormatterException {
117-
assume().that(Enums.getIfPresent(Modifier.class, "VALUE").isPresent()).isTrue();
118-
assertThat(ModifierOrderer.reorderModifiers("value final public").getText())
119-
.isEqualTo("public final value");
120-
}
121111
}

0 commit comments

Comments
 (0)