Allow -> as placeholder separator

google · Feb 2, 2025 · 9514b7d · 9514b7d
1 parent e2a0902
commit 9514b7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/mug-errorprone/src/main/java/com/google/mu/errorprone/FormatStringUtils.java b/mug-errorprone/src/main/java/com/google/mu/errorprone/FormatStringUtils.java
@@ -33,15 +33,17 @@
 final class FormatStringUtils {
   static final Substring.Pattern PLACEHOLDER_PATTERN =
       consecutive(CharMatcher.noneOf("{}")::matches).immediatelyBetween("{", INCLUSIVE, "}", INCLUSIVE);
+  static final Substring.Pattern PLACEHOLDER_SEPARATOR =
+      Stream.of("=", "->").map(Substring::first).collect(firstOccurrence());
   static final Substring.RepeatingPattern PLACEHOLDER_NAMES_PATTERN =
       consecutive(CharMatcher.noneOf("{}")::matches).immediatelyBetween("{", "}").repeatedly();
 
   static ImmutableList<String> placeholderVariableNames(String formatString) {
-    Substring.Pattern beforeEqualSign = Substring.before(first('='));
+    Substring.Pattern beforeSeparator = Substring.before(PLACEHOLDER_SEPARATOR);
     return PLACEHOLDER_NAMES_PATTERN
         .from(formatString)
         // for Cloud resource name syntax
-        .map(n -> beforeEqualSign.from(n).map(whitespace()::trimTrailingFrom).orElse(n))
+        .map(n -> beforeSeparator.from(n).map(whitespace()::trimTrailingFrom).orElse(n))
         .collect(toImmutableList());
   }
 

diff --git a/...orprone/src/test/java/com/google/mu/errorprone/StringFormatPlaceholderNamesCheckTest.java b/...orprone/src/test/java/com/google/mu/errorprone/StringFormatPlaceholderNamesCheckTest.java
@@ -244,6 +244,19 @@ public void trailingSpacesBeforeEqualSignIgnored() {
         .doTest();
   }
 
+  @Test
+  public void trailingSpacesBeforeArrowIgnored() {
+    helper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.mu.util.StringFormat;",
+            "class Test {",
+            "  private static final StringFormat FORMAT =",
+            "      new StringFormat(\"{shows_id -> id,}\");",
+            "}")
+        .doTest();
+  }
+
   @Ignore
   @Test
   public void squareBracketedPlaceholdersChecked() {