Kapt: remove obsolete option kapt.keep.kdoc.comments.in.stubs

The only issue where it was necessary (KT-43593) no longer reproduces,
so this option and the related test infra code is not needed anymore.

Author: udalov

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/Kapt3KotlinGradleSubplugin.kt

@@ -447,7 +447,6 @@ internal fun buildKaptSubpluginOptions(
         "${kaptExtension.strictMode}"
     )
     pluginOptions += SubpluginOption("stripMetadata", "${kaptExtension.stripMetadata}")
-    pluginOptions += SubpluginOption("keepKdocCommentsInStubs", "${KaptProperties.isKaptKeepKdocCommentsInStubs(project).get()}")
     pluginOptions += SubpluginOption("showProcessorTimings", "${kaptExtension.showProcessorStats}")
     pluginOptions += SubpluginOption("detectMemoryLeaks", kaptExtension.detectMemoryLeaks)
     pluginOptions += SubpluginOption("useK2", "${KaptProperties.isUseK2(project).get()}")

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/KaptProperties.kt

@@ -22,7 +22,6 @@ internal object KaptProperties {
     )
     private val KAPT_INFO_AS_WARNINGS = BooleanGradleProperty("kapt.info.as.warnings", false)
     private val KAPT_INCLUDE_COMPILE_CLASSPATH = BooleanGradleProperty("kapt.include.compile.classpath", true)
-    private val KAPT_KEEP_KDOC_COMMENTS_IN_STUBS = BooleanGradleProperty("kapt.keep.kdoc.comments.in.stubs", true)
     private val KAPT_USE_K2 = BooleanGradleProperty("kapt.use.k2", true)
     private val KAPT_DONT_WARN_ANNOTATION_PROCESSOR_DEPENDENCIES = BooleanGradleProperty(
         "kapt.dont.warn.annotationProcessor.dependencies",
@@ -47,10 +46,6 @@ internal object KaptProperties {
         it.property(KAPT_INCLUDE_COMPILE_CLASSPATH, project)
     }
 
-    fun isKaptKeepKdocCommentsInStubs(project: Project): Provider<Boolean> = project.propertiesService.flatMap {
-        it.property(KAPT_KEEP_KDOC_COMMENTS_IN_STUBS, project)
-    }
-
     fun isUseK2(project: Project): Provider<Boolean> = project.propertiesService.flatMap {
         it.property(KAPT_USE_K2, project).map { propValue ->
             if (!propValue)
@@ -70,4 +65,4 @@ internal object KaptProperties {
     fun getClassloadersCacheSize(project: Project): Provider<Int> = project.propertiesService.flatMap {
         it.property(CLASSLOADERS_CACHE_SIZE, project)
     }
-}
+}

plugins/kapt/kapt-base/src/org/jetbrains/kotlin/kapt/base/KaptContext.kt

@@ -151,9 +151,7 @@ open class KaptContext(val options: KaptOptions, val withJdk: Boolean, val logge
         }
 
         compiler = JavaCompiler.instance(context) as KaptJavaCompiler
-        if (options.flags[KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS]) {
-            compiler.keepComments = true
-        }
+        compiler.keepComments = true
 
         ClassReader.instance(context).saveParameterNames = true
 

plugins/kapt/kapt-base/src/org/jetbrains/kotlin/kapt/base/KaptOptions.kt

@@ -128,7 +128,6 @@ enum class KaptFlag(val description: String, val defaultValue: Boolean = false)
     INCLUDE_COMPILE_CLASSPATH("Detect annotation processors in compile classpath", defaultValue = true),
     INCREMENTAL_APT("Incremental annotation processing (apt mode)"),
     STRIP_METADATA("Strip @Metadata annotations from stubs"),
-    KEEP_KDOC_COMMENTS_IN_STUBS("Keep KDoc comments in stubs", defaultValue = true),
     ;
 }
 

plugins/kapt/kapt-cli/src/KaptCliOption.kt

@@ -208,12 +208,6 @@ enum class KaptCliOption(
         cliToolOption = CliToolOption("-Kapt-strip-metadata", FLAG)
     ),
 
-    KEEP_KDOC_COMMENTS_IN_STUBS(
-        "keepKdocCommentsInStubs",
-        "true | false",
-        "Keep KDoc comments in stubs"
-    ),
-
     USE_K2(
         "useK2",
         "true | false",

plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/KaptPlugin.kt

@@ -121,7 +121,6 @@ class KaptCommandLineProcessor : CommandLineProcessor {
             INFO_AS_WARNINGS_OPTION -> setFlag(KaptFlag.INFO_AS_WARNINGS, value)
             STRICT_MODE_OPTION -> setFlag(KaptFlag.STRICT, value)
             STRIP_METADATA_OPTION -> setFlag(KaptFlag.STRIP_METADATA, value)
-            KEEP_KDOC_COMMENTS_IN_STUBS -> setFlag(KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS, value)
             USE_K2 -> {}
 
             SHOW_PROCESSOR_STATS -> setFlag(KaptFlag.SHOW_PROCESSOR_STATS, value)

plugins/kapt/kapt-compiler/src/org/jetbrains/kotlin/kapt/stubs/KaptStubConverter.kt

@@ -153,7 +153,6 @@ class KaptStubConverter(val kaptContext: KaptContextForStubGeneration, val gener
     private val correctErrorTypes = kaptContext.options[KaptFlag.CORRECT_ERROR_TYPES]
     private val strictMode = kaptContext.options[KaptFlag.STRICT]
     private val stripMetadata = kaptContext.options[KaptFlag.STRIP_METADATA]
-    private val keepKdocComments = kaptContext.options[KaptFlag.KEEP_KDOC_COMMENTS_IN_STUBS]
 
     private val mutableBindings = mutableMapOf<String, KaptJavaFileObject>()
 
@@ -166,7 +165,7 @@ class KaptStubConverter(val kaptContext: KaptContextForStubGeneration, val gener
 
     private val signatureParser = SignatureParser(treeMaker)
 
-    private val kdocCommentKeeper = if (keepKdocComments) KaptDocCommentKeeper(kaptContext) else null
+    private val kdocCommentKeeper = KaptDocCommentKeeper(kaptContext)
 
     private val importsFromRoot by lazy(::collectImportsFromRootPackage)
 
@@ -286,9 +285,7 @@ class KaptStubConverter(val kaptContext: KaptContextForStubGeneration, val gener
         val classes = JavacList.of<JCTree>(classDeclaration)
 
         val topLevel = treeMaker.TopLevelJava9Aware(packageClause, imports + classes)
-        if (kdocCommentKeeper != null) {
-            topLevel.docComments = kdocCommentKeeper.getDocTable(topLevel)
-        }
+        topLevel.docComments = kdocCommentKeeper.getDocTable(topLevel)
 
         KaptJavaFileObject(topLevel, classDeclaration).apply {
             topLevel.sourcefile = this
@@ -1847,7 +1844,7 @@ class KaptStubConverter(val kaptContext: KaptContextForStubGeneration, val gener
     }
 
     private fun <T : JCTree> T.keepKdocCommentsIfNecessary(node: Any): T {
-        kdocCommentKeeper?.saveKDocComment(this, node)
+        kdocCommentKeeper.saveKDocComment(this, node)
         return this
     }