In stardoc proto output, mark macro visibility as non-configurable an…

…d natively defined. Follow-up fix to 59e99b6 PiperOrigin-RevId: 703255080 Change-Id: I1055c4c8b7e2e627199bdca9e2daab5654102831
bazelbuild · Dec 6, 2024 · e6a44c8 · e6a44c8
1 parent 7d2509e
commit e6a44c8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
@@ -71,6 +71,8 @@ public final class ModuleInfoExtractor {
               .setName("visibility")
               .setType(AttributeType.LABEL_LIST)
               .setMandatory(false)
+              .setNonconfigurable(true)
+              .setNativelyDefined(true)
               .setDocString(
                   "The visibility to be passed to this macro's exported targets. It always"
                       + " implicitly includes the location where this macro is instantiated, so"

diff --git a/tools/ctexplain/analyses/summary.py b/tools/ctexplain/analyses/summary.py
@@ -17,7 +17,7 @@
 from dataclasses import dataclass
 
 from tools.ctexplain.types import ConfiguredTarget
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.util as util
+import tools.ctexplain.util as util
 
 
 @dataclass(frozen=True)

diff --git a/tools/ctexplain/analyses/summary_test.py b/tools/ctexplain/analyses/summary_test.py
@@ -16,7 +16,7 @@
 
 from frozendict import frozendict
 
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.analyses.summary as summary
+import tools.ctexplain.analyses.summary as summary
 from tools.ctexplain.types import Configuration
 from tools.ctexplain.types import ConfiguredTarget
 from tools.ctexplain.types import NullConfiguration

diff --git a/tools/ctexplain/ctexplain.py b/tools/ctexplain/ctexplain.py
@@ -41,11 +41,11 @@
 from absl import flags
 from dataclasses import dataclass
 
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.analyses.summary as summary
+import tools.ctexplain.analyses.summary as summary
 from tools.ctexplain.bazel_api import BazelApi
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.lib as lib
+import tools.ctexplain.lib as lib
 from tools.ctexplain.types import ConfiguredTarget
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.util as util
+import tools.ctexplain.util as util
 
 FLAGS = flags.FLAGS
 

diff --git a/tools/ctexplain/lib.py b/tools/ctexplain/lib.py
@@ -14,7 +14,7 @@
 """General-purpose business logic."""
 from typing import Tuple
 
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.bazel_api as bazel_api
+import tools.ctexplain.bazel_api as bazel_api
 from tools.ctexplain.types import ConfiguredTarget
 
 

diff --git a/tools/ctexplain/lib_test.py b/tools/ctexplain/lib_test.py
@@ -14,8 +14,8 @@
 """Tests for lib.py."""
 import unittest
 from src.test.py.bazel import test_base
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.bazel_api as bazel_api
-# Do not edit this line. Copybara replaces it with PY2 migration helper..third_party.bazel.tools.ctexplain.lib as lib
+import tools.ctexplain.bazel_api as bazel_api
+import tools.ctexplain.lib as lib
 from tools.ctexplain.types import Configuration
 from tools.ctexplain.types import HostConfiguration
 from tools.ctexplain.types import NullConfiguration