Deal with Issue#7

nekocode · Jul 10, 2016 · ccd3b90 · ccd3b90
1 parent a27457e
commit ccd3b90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>cn.nekocode.plugin.parcelablegenerator</id>
     <name>Parcelable Code Generator(for kotlin's data class)</name>
-    <version>0.4.5</version>
+    <version>0.4.6</version>
     <vendor email="[email protected]" url="https://github.com/nekocode/android-parcelable-intellij-plugin-kotlin">nekocode</vendor>
 
     <description><![CDATA[

diff --git a/src/cn/nekocode/plugin/parcelablegenerator/CodeGenerator.java b/src/cn/nekocode/plugin/parcelablegenerator/CodeGenerator.java
@@ -40,12 +40,12 @@ public CodeGenerator(KtClass ktClass, List<ValueParameterDescriptor> fields) {
     private String generateStaticCreator(KtClass ktClass) {
         String className = ktClass.getName();
 
-        return "companion object { @JvmField final val CREATOR: Parcelable.Creator<" +
+        return "companion object { @JvmField val CREATOR: Parcelable.Creator<" +
                 className + "> = object : Parcelable.Creator<" + className + "> {" +
                 "override fun createFromParcel(source: Parcel): " + className +
-                "{return " + className + "(source)}" +
-                "override fun newArray(size: Int): Array<" + className + "?> {" +
-                "return arrayOfNulls(size)}" + "}}";
+                " = " + className + "(source)" +
+                "\noverride fun newArray(size: Int): Array<" + className + "?> =" +
+                "arrayOfNulls(size)" + "}}";
     }
 
     private String generateConstructor(List<TypeSerializer> typeSerializers) {
@@ -63,7 +63,7 @@ private String generateConstructor(List<TypeSerializer> typeSerializers) {
     }
 
     private String generateDescribeContents() {
-        return "override fun describeContents(): Int {return 0}";
+        return "override fun describeContents() = 0";
     }
 
     private String generateWriteToParcel(List<TypeSerializer> typeSerializers) {