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

Kapt: Support default packages in Filer

Browse Source 
(cherry picked from commit 3ced8a6)
This commit is contained in:
Yan Zhulanow
2016-08-12 03:26:51 +03:00
committed by Yan Zhulanow
parent 8c4fb0a709
commit d07e6c752b
1 changed files with 8 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/impl/KotlinFiler.kt
+7 -3
View File
@@ -34,10 +34,14 @@ class KotlinFiler(val generatedSourceDir: File, val classesOutputDir: File) : Fi
val isPackageInfo = name.endsWith(PACKAGE_INFO_SUFFIX) val isPackageInfo = name.endsWith(PACKAGE_INFO_SUFFIX)
val fqName = if (isPackageInfo) name.substring(0, PACKAGE_INFO_SUFFIX.length) else name val fqName = if (isPackageInfo) name.substring(0, PACKAGE_INFO_SUFFIX.length) else name
val packageName = fqName.substringBeforeLast('.') val packageName = fqName.substringBeforeLast('.', "")
val packageDir = File(generatedSourceDir, packageName.replace('.', '/')) val packageDir = if (packageName.isNotEmpty()) {
packageDir.mkdirs() File(generatedSourceDir, packageName.replace('.', '/')).apply { mkdirs() }
}
else {
generatedSourceDir
}
val fileName = fqName.substringAfterLast('.') + (if (isPackageInfo) PACKAGE_INFO_SUFFIX else extension) val fileName = fqName.substringAfterLast('.') + (if (isPackageInfo) PACKAGE_INFO_SUFFIX else extension)
return File(packageDir, fileName) return File(packageDir, fileName)