Fix Issue wuseal#123 - File Already exists

Karthik2007 · Apr 21, 2019 · 353df83 · 353df83
1 parent 542f119
commit 353df83
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt b/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt
@@ -249,18 +249,20 @@ class KotlinDataClassFileGenerator(private val interceptors: List<IKotlinDataCla
     ): String {
         var newFileName = fileName
         val kotlinFileSuffix = ".kt"
-        val fileNamesWithoutSuffix =
+        val fileNamesInLowerCaseWithoutSuffix =
             directory.files.filter { it.name.endsWith(kotlinFileSuffix) }
-                .map { it.name.dropLast(kotlinFileSuffix.length) }
-        while (fileNamesWithoutSuffix.contains(newFileName)) {
+                .map { it.name.dropLast(kotlinFileSuffix.length).toLowerCase() }
+        while (fileNamesInLowerCaseWithoutSuffix.contains(newFileName.toLowerCase())) {
             newFileName += "X"
         }
         return newFileName
     }
 
     private fun changeClassNameIfCurrentListContains(classesNames: List<String>, className: String): String {
         var newClassName = className
-        while (classesNames.contains(newClassName)) {
+
+        var fileNamesInLowerCase = classesNames.map { it.toLowerCase() }
+        while (fileNamesInLowerCase.contains(newClassName.toLowerCase())) {
             newClassName += "X"
         }
         return newClassName