Merge pull request #211 from TedZen/3.4.0-bugfix#198

bug fixed #198

Author: wuseal

src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/Property.kt

@@ -30,7 +30,9 @@ data class Property(
                     append(annotationsCode).append(separatorBetweenAnnotationAndProperty)
                 }
             }
-            append(keyword).append(" ").append(name).append(": ").append(type)
+            append(keyword).append(" ")
+            append(if (name.first().isDigit() || name.contains('$')) "`$name`" else name)
+            append(": ").append(type)
             if (value.isNotBlank()) {
                 append(" = ").append(value)
             }

src/main/kotlin/wu/seal/jsontokotlin/codeelements/KProperty.kt

@@ -17,13 +17,15 @@ interface IProperty {
 
 }
 
-class KProperty(private val rawPropertyName: String, private val propertyType: String, private val propertyValue: String) : IProperty {
+class KProperty(rawPropertyName: String, private val propertyType: String, private val propertyValue: String) : IProperty {
+
+    private val noLinebreakPropertyName = rawPropertyName.replace("\n","\\n").take(255)
 
     override fun getPropertyStringBlock(): String {
 
         val blockBuilder = StringBuilder()
 
-        blockBuilder.append(NoneSupporter.getNoneLibSupporterProperty(rawPropertyName, propertyType))
+        blockBuilder.append(NoneSupporter.getNoneLibSupporterProperty(noLinebreakPropertyName, propertyType))
 
         return blockBuilder.toString()
     }

src/test/kotlin/extensions/ted/zeng/BugTest198.kt

@@ -0,0 +1,24 @@
+package extensions.ted.zeng
+
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import wu.seal.jsontokotlin.ConfigManager
+import wu.seal.jsontokotlin.codeelements.KProperty
+import wu.seal.jsontokotlin.test.TestConfig
+
+class BugTest198 {
+    @Before
+    fun setup(){
+        TestConfig.isTestModel = true
+        ConfigManager.indent = 0
+    }
+    @Test
+    fun propertyNameCheck(){
+        val kp = KProperty("X\n\nX","Int","1")
+        kp.getPropertyStringBlock().should.equal("val X\\n\\nX: Int")
+
+    }
+
+
+}