Fix Printer.getPrinter(boolean)

Also rename it to a separate function since boolean args are vague.

RELNOTES: None
PiperOrigin-RevId: 192201308

2 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
index 3fbb5dbaa8..4f8984efb0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
@@ -27,6 +27,7 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.events.NullEventHandler;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
+import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
 import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -533,9 +534,10 @@ class SkylarkCustomCommandLine extends CommandLine {
     String format(Object object) throws CommandLineExpansionException {
       try {
         args.set(0, object);
-        return Printer.getPrinter(skylarkSemantics.incompatibleDisallowOldStyleArgsAdd())
-            .formatWithList(formatStr, args)
-            .toString();
+        SkylarkPrinter printer =
+            skylarkSemantics.incompatibleDisallowOldStyleArgsAdd()
+                ? Printer.getSimplifiedPrinter() : Printer.getPrinter();
+        return printer.formatWithList(formatStr, args).toString();
       } catch (IllegalFormatException e) {
         throw new CommandLineExpansionException(errorMessage(e.getMessage(), location, null));
       }
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
index 697248a8fb..dfbc651a11 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
@@ -71,12 +71,11 @@ public class Printer {
   }
 
   /**
-   * Creates an instance of {@link BasePrinter} with an empty buffer.
-   *
-   * @param simplifiedFormatStrings if true, format strings will allow only %s and %%
+   * Creates an instance of {@link BasePrinter} with an empty buffer and whose format strings allow
+   * only %s and %%.
    */
-  public static BasePrinter getPrinter(boolean simplifiedFormatStrings) {
-    return getPrinter(new StringBuilder());
+  public static BasePrinter getSimplifiedPrinter() {
+    return new BasePrinter(new StringBuilder(), /*simplifiedFormatStrings=*/ true);
   }
 
   private Printer() {}