azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kapt: Support "*" in supported annotation qualified names (all annotations)

Browse Source 
(cherry picked from commit 27ec053)
This commit is contained in:
Yan Zhulanow
2016-07-14 23:24:31 +03:00
committed by Yan Zhulanow
parent a73cf65840
commit 9d2144f221
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingExtension.kt
+11 -4
View File
@@ -73,14 +73,21 @@ class AnnotationProcessingExtension(
// Round 1 // Round 1
val round1Environment = KotlinRoundEnvironment(analysisContext) val round1Environment = KotlinRoundEnvironment(analysisContext)
for (processor in processors) { for (processor in processors) {
val supportedAnnotationNames = processor.supportedAnnotationTypes.filter { it in analysisContext.annotationsMap } val supportedAnnotationNames = processor.supportedAnnotationTypes
if (supportedAnnotationNames.isEmpty()) continue val supportsAnyAnnotation = supportedAnnotationNames.contains("*")
val applicableAnnotationNames = when (supportsAnyAnnotation) {
true -> analysisContext.annotationsMap.keys
false -> processor.supportedAnnotationTypes.filter { it in analysisContext.annotationsMap }
}
if (applicableAnnotationNames.isEmpty()) continue
val supportedAnnotations = supportedAnnotationNames val applicableAnnotations = applicableAnnotationNames
.map { javaPsiFacade.findClass(it, projectScope)?.let { JeTypeElement(it) } } .map { javaPsiFacade.findClass(it, projectScope)?.let { JeTypeElement(it) } }
.filterNotNullTo(hashSetOf()) .filterNotNullTo(hashSetOf())
processor.process(supportedAnnotations, round1Environment) processor.process(applicableAnnotations, round1Environment)
} }
// Round 2 // Round 2