From a76cf2f4c3aa514dffa1ddc038c196103ae4583c Mon Sep 17 00:00:00 2001
From: Googler <ilist@google.com>
Date: Wed, 28 Sep 2022 10:09:54 -0700
Subject: [PATCH] Rollforward of
 https://github.com/bazelbuild/bazel/commit/59e51fe625f485dc664928ae0ad93035808779f3:
 Flip default value of incompatible_remove_rule_name_parameter

RELNOTES[INC]: name parameter is removed from rule call (https://github.com/bazelbuild/bazel/issues/16301)

PiperOrigin-RevId: 477483258
Change-Id: I25e1855731f51e4d4a568e51739aa2f134242ca3
---
 .../lib/packages/semantics/BuildLanguageOptions.java   |  4 ++--
 .../lib/starlark/StarlarkRuleClassFunctionsTest.java   |  4 ++++
 .../com/google/devtools/build/skydoc/SkydocTest.java   | 10 +++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
index 7318c51dff10a4..a3518ad3c1cf64 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
@@ -70,7 +70,7 @@ public final class BuildLanguageOptions extends OptionsBase {
 
   @Option(
       name = "incompatible_remove_rule_name_parameter",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
@@ -724,7 +724,7 @@ public StarlarkSemantics toStarlarkSemantics() {
   public static final String INCOMPATIBLE_STOP_EXPORTING_LANGUAGE_MODULES =
       "-incompatible_stop_exporting_language_modules";
   public static final String INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER =
-      "-incompatible_remove_rule_name_parameter";
+      "+incompatible_remove_rule_name_parameter";
   public static final String INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR =
       "+incompatible_disallow_symlink_file_to_dir";
   public static final String EXPERIMENTAL_ALLOW_TAGS_PROPAGATION =
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
index 6063400ee73137..155fb2dbe13469 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -947,6 +947,7 @@ public void testExportAliasedName() throws Exception {
 
   @Test
   public void testExportWithSpecifiedName() throws Exception {
+    setBuildLanguageOptions("--noincompatible_remove_rule_name_parameter");
     evalAndExport(
         ev, //
         "def _impl(ctx): pass",
@@ -961,6 +962,7 @@ public void testExportWithSpecifiedName() throws Exception {
 
   @Test
   public void testExportWithSpecifiedNameFailure() throws Exception {
+    setBuildLanguageOptions("--noincompatible_remove_rule_name_parameter");
     ev.setFailFast(false);
 
     evalAndExport(
@@ -973,6 +975,7 @@ public void testExportWithSpecifiedNameFailure() throws Exception {
 
   @Test
   public void testExportWithNonStringNameFailsCleanly() throws Exception {
+    setBuildLanguageOptions("--noincompatible_remove_rule_name_parameter");
     ev.setFailFast(false);
 
     evalAndExport(
@@ -985,6 +988,7 @@ public void testExportWithNonStringNameFailsCleanly() throws Exception {
 
   @Test
   public void testExportWithMultipleErrors() throws Exception {
+    setBuildLanguageOptions("--noincompatible_remove_rule_name_parameter");
     ev.setFailFast(false);
 
     evalAndExport(
diff --git a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
index 3b95ff0cb8b7e6..939666688a992a 100644
--- a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
+++ b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
@@ -22,7 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; // a bad dependency!
+import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -267,7 +267,9 @@ public void testRuleExportedWithSpecifiedName() throws Exception {
 
     Module unused =
         skydocMain.eval(
-            StarlarkSemantics.DEFAULT,
+            StarlarkSemantics.builder()
+                .setBool(BuildLanguageOptions.INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER, false)
+                .build(),
             Label.parseAbsoluteUnchecked("//test:test.bzl"),
             ruleInfoMap,
             ImmutableMap.builder(),
@@ -294,7 +296,9 @@ public void testUnassignedRuleNotDocumented() throws Exception {
 
     Module unused =
         skydocMain.eval(
-            StarlarkSemantics.DEFAULT,
+            StarlarkSemantics.builder()
+                .setBool(BuildLanguageOptions.INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER, false)
+                .build(),
             Label.parseAbsoluteUnchecked("//test:test.bzl"),
             ruleInfoMap,
             ImmutableMap.builder(),