ctx.new_file(Artifact, String) now replaces the basename of the base artifact with the given name instead of appending a suffix

--
MOS_MIGRATED_REVID=101348273

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
index 4650e91873..93ff5aa416 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
@@ -399,17 +399,19 @@ public final class SkylarkRuleContext {
   }
 
   @SkylarkCallable(doc =
-      "Creates a new file object, derived from the given file and suffix. " + DOC_NEW_FILE_TAIL)
+      "Creates a new file object, derived from the given file and suffix. " + DOC_NEW_FILE_TAIL
+      + " Deprecated.")
   public Artifact newFileSuffix(Artifact baseArtifact, String suffix) {
-    return newFile(baseArtifact, suffix);
+    return newFile(baseArtifact, baseArtifact.getRootRelativePath().getBaseName() + suffix);
   }
 
   @SkylarkCallable(doc =
-      "Creates a new file object, derived from the given file and suffix. " + DOC_NEW_FILE_TAIL
-      + " Deprecated: Please use ctx.new_file_suffix() instead.")
-  public Artifact newFile(Artifact baseArtifact, String suffix) {
+      "Creates a new file object in the same directory as the original file. "
+      + DOC_NEW_FILE_TAIL)
+
+  public Artifact newFile(Artifact baseArtifact, String newBaseName) {
     PathFragment original = baseArtifact.getRootRelativePath();
-    PathFragment fragment = original.replaceName(original.getBaseName() + suffix);
+    PathFragment fragment = original.replaceName(newBaseName);
     Root root = ruleContext.getBinOrGenfilesDirectory();
     return ruleContext.getDerivedArtifact(fragment, root);
   }