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

Render targeted annotations without escaping brackets

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-27 19:47:37 +03:00
parent 298093c4bd
commit 9dbd355e92
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+5 -1
View File
@@ -339,18 +339,22 @@ internal class DescriptorRendererImpl(
if (DescriptorRendererModifier.ANNOTATIONS !in modifiers) return if (DescriptorRendererModifier.ANNOTATIONS !in modifiers) return
val excluded = if (annotated is JetType) excludedTypeAnnotationClasses else excludedAnnotationClasses val excluded = if (annotated is JetType) excludedTypeAnnotationClasses else excludedAnnotationClasses
var hasTargetedAnnotations = false
val annotationsBuilder = StringBuilder { val annotationsBuilder = StringBuilder {
for ((annotation, target) in annotated.getAnnotations().getAllAnnotations()) { for ((annotation, target) in annotated.getAnnotations().getAllAnnotations()) {
val annotationClass = annotation.getType().getConstructor().getDeclarationDescriptor() as ClassDescriptor val annotationClass = annotation.getType().getConstructor().getDeclarationDescriptor() as ClassDescriptor
if (!excluded.contains(DescriptorUtils.getFqNameSafe(annotationClass))) { if (!excluded.contains(DescriptorUtils.getFqNameSafe(annotationClass))) {
if (target != null && !hasTargetedAnnotations) {
hasTargetedAnnotations = true
}
append(renderAnnotation(annotation, target)).append(" ") append(renderAnnotation(annotation, target)).append(" ")
} }
} }
} }
if (!needBrackets) { if (!needBrackets || hasTargetedAnnotations) {
builder.append(annotationsBuilder) builder.append(annotationsBuilder)
} }
else if (annotationsBuilder.length() > 0) { else if (annotationsBuilder.length() > 0) {