修复var和list名字bug

fluttercandies · Jan 7, 2020 · 88bdbb5 · 88bdbb5
1 parent 72c239a
commit 88bdbb5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin_version=1.3.61
-pluginVersion=3.2.6
+pluginVersion=3.2.7
 #每次修改这里去打包
 ideaVersionPrefix=193
 ideaVersion=
diff --git a/src/main/java/com/ruiyu/jsontodart/ClassGeneratorInfo.kt b/src/main/java/com/ruiyu/jsontodart/ClassGeneratorInfo.kt
@@ -56,7 +56,7 @@ class HelperClassGeneratorInfo {
         //是否是基础数据类型
         val isPrimitive = PRIMITIVE_TYPES[type] ?: false
         //是否是list
-        val isListType = type.contains("List")
+        val isListType = isListType(type)
         return when {
             isPrimitive -> {
                 when {
@@ -121,7 +121,7 @@ class HelperClassGeneratorInfo {
         //是否是基础数据类型
         val isPrimitive = PRIMITIVE_TYPES[type] ?: false
         //是否是list
-        val isListType = type.contains("List")
+        val isListType = isListType(type)
         val thisKey = "entity.$name"
         if (isPrimitive) {
             return "data['$getJsonName'] = $thisKey;"

diff --git a/src/main/java/com/ruiyu/jsontodart/utils/Helper.kt b/src/main/java/com/ruiyu/jsontodart/utils/Helper.kt
@@ -19,6 +19,7 @@ val PRIMITIVE_TYPES = mapOf(
         "List<bool>" to true,
         "List" to true,
         "Null" to true,
+        "var" to true,
         "dynamic" to true
 )
 
@@ -35,6 +36,17 @@ fun getListSubType(typeName: String): String {
     )[typeName] ?: typeName.substringAfter("<").substringBefore(">")
 }
 
+fun isListType(typeName: String): Boolean {
+    return when {
+        typeName.contains("List<") -> {
+            true
+        }
+        else -> {
+            typeName == "List"
+        }
+    }
+}
+
 val dartKeyword = mutableListOf("abstract", "dynamic", "implements", "show",
         "as", "else", "import ", "static",
         "assert", "enum", "in", "super",