diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2020-10-16 23:35:01 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2020-10-20 21:54:26 -0600 |
| commit | caf66d02fde298fcb010668e353a156bf2d49661 (patch) | |
| tree | 15d4bc11576ed9a76226589517148e23dc6182dc /errorprone | |
| parent | 5c46da2a14e8ec8f0f39dc7802292581f7c4593e (diff) | |
Expand formatSimple() to support widths.
One of the highest-traffic users of String.format() is in the
notification code, which uses argument widths. To support these
use-cases, this change adds argument width support, with tests.
Bug: 170978902
Test: atest error_prone_android_framework_test
Exempt-From-Owner-Approval: trivial additions
Change-Id: I8e36d4725a6d0cc896dedc5c457eb5f38486d7b6
Diffstat (limited to 'errorprone')
2 files changed, 12 insertions, 4 deletions
diff --git a/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java b/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java index d2cb030faef6..3a0fbd33933f 100644 --- a/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java +++ b/errorprone/java/com/google/errorprone/bugpatterns/android/EfficientStringsChecker.java @@ -180,8 +180,10 @@ public final class EfficientStringsChecker extends BugChecker for (int i = 0; i < format.length(); i++) { char c = format.charAt(i); if (c == '%') { - i++; - c = format.charAt(i); + c = format.charAt(++i); + while ('0' <= c && c <= '9') { + c = format.charAt(++i); + } switch (c) { case 'b': case 'c': diff --git a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/EfficientStringsCheckerTest.java b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/EfficientStringsCheckerTest.java index ae9c316b8ca7..48e4ad11f9bf 100644 --- a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/EfficientStringsCheckerTest.java +++ b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/EfficientStringsCheckerTest.java @@ -41,9 +41,13 @@ public class EfficientStringsCheckerTest { assertTrue(EfficientStringsChecker.isSimple("")); assertTrue(EfficientStringsChecker.isSimple("%s")); assertTrue(EfficientStringsChecker.isSimple("String %s%s and %%%% number %d%d together")); + assertTrue(EfficientStringsChecker.isSimple("%04d")); + assertTrue(EfficientStringsChecker.isSimple("%02x:%02x:%02x")); + assertTrue(EfficientStringsChecker.isSimple("%10d")); - assertFalse(EfficientStringsChecker.isSimple("%04d")); - assertFalse(EfficientStringsChecker.isSimple("%02x:%02x:%02x")); + assertFalse(EfficientStringsChecker.isSimple("%0.4f")); + assertFalse(EfficientStringsChecker.isSimple("%t")); + assertFalse(EfficientStringsChecker.isSimple("%1$s")); } @Test @@ -58,6 +62,7 @@ public class EfficientStringsCheckerTest { " String.format(\"foo %s bar\", str);", " // BUG: Diagnostic contains:", " String.format(\"foo %d bar\", 42);", + " // BUG: Diagnostic contains:", " String.format(\"foo %04d bar\", 42);", " }", " public void exampleLocale(String str) {", @@ -66,6 +71,7 @@ public class EfficientStringsCheckerTest { " String.format(Locale.US, \"foo %s bar\", str);", " // BUG: Diagnostic contains:", " String.format(Locale.US, \"foo %d bar\", 42);", + " // BUG: Diagnostic contains:", " String.format(Locale.US, \"foo %04d bar\", 42);", " }", "}") |