From cfe6f89689dcaebe68e6c31357b5c58da82b57bf Mon Sep 17 00:00:00 2001 From: Karthik Mahesh Date: Tue, 17 Oct 2023 15:42:04 -0700 Subject: Mark adders as @hide if field is hidden. Bug: 306237952 Test: manual test to verify that @hide is propagated, and adder does not get included in current.txt Change-Id: I9602ee20bc40a66cfbc1651b1a6c111ab17ff044 --- tools/codegen/src/com/android/codegen/Generators.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tools/codegen/src') diff --git a/tools/codegen/src/com/android/codegen/Generators.kt b/tools/codegen/src/com/android/codegen/Generators.kt index 685733386cae..d3a8b033dfff 100644 --- a/tools/codegen/src/com/android/codegen/Generators.kt +++ b/tools/codegen/src/com/android/codegen/Generators.kt @@ -327,7 +327,8 @@ private fun ClassPrinter.generateBuilderSetters(visibility: String) { +"return$maybeCast this;" } - val javadocSeeSetter = "/** @see #$setterName */" + val javadocSeeSetter = + if (isHidden()) "/** @see #$setterName @hide */" else "/** @see #$setterName */" val adderName = "add$SingularName" val singularNameCustomizationHint = if (SingularNameOrNull == null) { @@ -750,6 +751,15 @@ fun ClassPrinter.generateGetters() { } } +fun FieldInfo.isHidden(): Boolean { + if (javadocFull != null) { + (javadocFull ?: "/**\n */").lines().forEach { + if (it.contains("@hide")) return true + } + } + return false +} + fun FieldInfo.generateFieldJavadoc(forceHide: Boolean = false) = classPrinter { if (javadocFull != null || forceHide) { var hidden = false -- cgit v1.2.3-59-g8ed1b