From eb71e686da1be91a967fe98c2dbcc9c2926c7f8a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 26 Nov 2019 16:45:22 +0300 Subject: [PATCH] Stable order of generated annotation targets A random order of usages is enabled in 193 platform that makes tests flaky without the commit. --- .../jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt | 2 +- idea/testData/quickfix/addAnnotationTarget/basic4.kt.after | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt index 9e72d75dca3..ffcc4c7ba1b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddAnnotationTargetFix.kt @@ -93,7 +93,7 @@ private fun KtAnnotationEntry.getRequiredAnnotationTargets(annotationClass: KtCl }.flatten().toSet() val annotationTargetValueNames = AnnotationTarget.values().map { it.name } return (requiredTargets + otherReferenceRequiredTargets).asSequence().distinct().filter { it.name in annotationTargetValueNames } - .toList() + .toList().sorted() } private fun getActualTargetList(annotated: PsiTarget): AnnotationChecker.Companion.TargetList { diff --git a/idea/testData/quickfix/addAnnotationTarget/basic4.kt.after b/idea/testData/quickfix/addAnnotationTarget/basic4.kt.after index b2aa9fc111f..fe6389e13b6 100644 --- a/idea/testData/quickfix/addAnnotationTarget/basic4.kt.after +++ b/idea/testData/quickfix/addAnnotationTarget/basic4.kt.after @@ -1,6 +1,6 @@ // "Add annotation target" "true" -@Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.TYPE) annotation class Foo @Foo