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

Kapt1: Allow to use spaces in the collected identifiers (KT-12769)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-02-17 19:15:21 +03:00
parent 948207be30
commit d30dbf25b5
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
+15 -3
View File
@@ -170,6 +170,8 @@ abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations:
} }
private fun recordClass(packageName: String, className: String) { private fun recordClass(packageName: String, className: String) {
if (!isValidName(packageName) || !isValidName(className)) return
val packageNameId = if (!packageName.isEmpty()) val packageNameId = if (!packageName.isEmpty())
shortenedPackageNameCache.save(packageName, writer) shortenedPackageNameCache.save(packageName, writer)
else null else null
@@ -180,17 +182,23 @@ abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations:
private fun recordAnnotation(name: String?, type: String, annotationDesc: String) { private fun recordAnnotation(name: String?, type: String, annotationDesc: String) {
val annotationFqName = Type.getType(annotationDesc).className val annotationFqName = Type.getType(annotationDesc).className
if (!isAnnotationHandled(annotationFqName)) return if (!isAnnotationHandled(annotationFqName) || !isValidName(annotationFqName)) return
if (name != null && !isValidName(name)) return
try { try {
val annotationId = shortenedAnnotationCache.save(annotationFqName, writer)
val packageName = this.currentPackageName val packageName = this.currentPackageName
if (!isValidName(packageName)) return
val className = this.currentClassSimpleName
if (!isValidName(className)) return
val annotationId = shortenedAnnotationCache.save(annotationFqName, writer)
val packageNameId = if (!packageName.isEmpty()) val packageNameId = if (!packageName.isEmpty())
shortenedPackageNameCache.save(packageName, writer) shortenedPackageNameCache.save(packageName, writer)
else null else null
val className = this.currentClassSimpleName
val outputClassName = getOutputClassName(packageNameId, className) val outputClassName = getOutputClassName(packageNameId, className)
val elementName = if (name != null) " $name" else "" val elementName = if (name != null) " $name" else ""
@@ -201,6 +209,10 @@ abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations:
} }
} }
private fun isValidName(name: String): Boolean {
return ' ' !in name
}
private fun getOutputClassName(packageNameId: String?, className: String): String { private fun getOutputClassName(packageNameId: String?, className: String): String {
return if (packageNameId == null) className else "$packageNameId/$className" return if (packageNameId == null) className else "$packageNameId/$className"
} }