Don't extract return value type accesses for external annotations

smowton · smowton · commit 0a788bcbc13e · 2022-12-09T10:33:05.000Z
This would cause inconsistencies when both the source and external view of the class are in scope, since the type access has a fresh id.
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -642,7 +642,7 @@ open class KotlinFileExtractor(
                                 if (getter == null) {
                                     logger.warnElement("Expected an annotation property to have a getter", it)
                                 } else {
-                                    extractFunction(getter, id, extractBody = false, extractMethodAndParameterTypeAccesses = true, extractAnnotations = true, null, listOf())?.also { functionLabel ->
+                                    extractFunction(getter, id, extractBody = false, extractMethodAndParameterTypeAccesses = extractFunctionBodies, extractAnnotations = true, null, listOf())?.also { functionLabel ->
                                         tw.writeIsAnnotElem(functionLabel.cast())
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ open class KotlinFileExtractor(`
`642`	`642`	`if (getter == null) {`
`643`	`643`	`logger.warnElement("Expected an annotation property to have a getter", it)`
`644`	`644`	`} else {`
`645`		`- extractFunction(getter, id, extractBody = false, extractMethodAndParameterTypeAccesses = true, extractAnnotations = true, null, listOf())?.also { functionLabel ->`
	`645`	`+ extractFunction(getter, id, extractBody = false, extractMethodAndParameterTypeAccesses = extractFunctionBodies, extractAnnotations = true, null, listOf())?.also { functionLabel ->`
`646`	`646`	`tw.writeIsAnnotElem(functionLabel.cast())`
`647`	`647`	`}`
`648`	`648`	`}`