Trim function params in TemplateExpander

There is a MacOS integration test that checks that we're trimming before
looking up labels, but it only checks for genrules, which aren't using this
code path yet.

This was changed in https://github.com/bazelbuild/bazel/commit/1a8d6b888ce532f5e053ecab37874740ce61e37f and we could see breakages in non-genrule
usage if a release picks up that change but not this.

PiperOrigin-RevId: 173393718

1 files changed, 7 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/stringtemplate/TemplateExpanderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/stringtemplate/TemplateExpanderTest.java
index 33a2f5bcc2..d2740b6465 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/stringtemplate/TemplateExpanderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/stringtemplate/TemplateExpanderTest.java
@@ -200,4 +200,11 @@ public class TemplateExpanderTest {
     assertThat(expand("$${file%:.*8}")).isEqualTo("${file%:.*8}");
     assertThat(expand("$$(basename file)")).isEqualTo("$(basename file)");
   }
+
+  // Regression test: check that the parameter is trimmed before expanding.
+  @Test
+  public void testFunctionExpansionIsTrimmed() throws Exception {
+    context.functions.put("foo", (String p) -> "FOO(" + p + ")");
+    assertThat(expand("$(foo  baz )")).isEqualTo("FOO(baz)");
+  }
 }