diff options
Diffstat (limited to 'test-utils')
-rw-r--r-- | test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAliasComparisonProcessor.kt | 6 | ||||
-rw-r--r-- | test-utils/testData/api/typeAliasComparison.kt | 24 |
2 files changed, 16 insertions, 14 deletions
diff --git a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAliasComparisonProcessor.kt b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAliasComparisonProcessor.kt index 965f2b5a..ac952ce9 100644 --- a/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAliasComparisonProcessor.kt +++ b/test-utils/src/main/kotlin/com/google/devtools/ksp/processor/TypeAliasComparisonProcessor.kt @@ -37,7 +37,9 @@ open class TypeAliasComparisonProcessor : AbstractTestProcessor() { listOf(this) + ((this.declaration as? KSTypeAlias)?.type?.resolve()?.aliases() ?: emptyList()) val interesting = setOf("Anno", "Bnno") - val iRefs = refs.filterNot { it.annotations.all { it.shortName.asString() !in interesting } } + val iRefs = refs.filterNot { + it.origin != Origin.KOTLIN || it.annotations.all { it.shortName.asString() !in interesting } + } val types = iRefs.map { it.resolve()!! }.flatMap { it.aliases() } for (i in types) { @@ -49,7 +51,7 @@ open class TypeAliasComparisonProcessor : AbstractTestProcessor() { } override fun toResult(): List<String> { - return results + return results.sorted() } } diff --git a/test-utils/testData/api/typeAliasComparison.kt b/test-utils/testData/api/typeAliasComparison.kt index 78a613d8..63262c5b 100644 --- a/test-utils/testData/api/typeAliasComparison.kt +++ b/test-utils/testData/api/typeAliasComparison.kt @@ -18,22 +18,22 @@ // WITH_RUNTIME // TEST PROCESSOR: TypeAliasComparisonProcessor // EXPECTED: -// [@Anno] [typealias F] = [@Anno] [typealias F] : true -// [@Anno] [typealias F] = String : true -// [@Anno] [typealias F] = [@Bnno] [typealias F] : true -// [@Anno] [typealias F] = String : true -// String = [@Anno] [typealias F] : true // String = String : true -// String = [@Bnno] [typealias F] : true // String = String : true -// [@Bnno] [typealias F] = [@Anno] [typealias F] : true -// [@Bnno] [typealias F] = String : true -// [@Bnno] [typealias F] = [@Bnno] [typealias F] : true -// [@Bnno] [typealias F] = String : true -// String = [@Anno] [typealias F] : true // String = String : true -// String = [@Bnno] [typealias F] : true // String = String : true +// String = [@Anno] [typealias F] : true +// String = [@Anno] [typealias F] : true +// String = [@Bnno] [typealias F] : true +// String = [@Bnno] [typealias F] : true +// [@Anno] [typealias F] = String : true +// [@Anno] [typealias F] = String : true +// [@Anno] [typealias F] = [@Anno] [typealias F] : true +// [@Anno] [typealias F] = [@Bnno] [typealias F] : true +// [@Bnno] [typealias F] = String : true +// [@Bnno] [typealias F] = String : true +// [@Bnno] [typealias F] = [@Anno] [typealias F] : true +// [@Bnno] [typealias F] = [@Bnno] [typealias F] : true // END annotation class Anno |