Release Version 1.6.3

Optimize Reuse kotlin file class name logic

Author: sealkingking

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>wu.seal.tool.jsontokotlin</id>
   <name>JsonToKotlinClass</name>
-  <version>1.6.2</version>
+  <version>1.6.3</version>
   <vendor email="[email protected]" url="https://www.github.com/wuseal">Seal</vendor>
 
   <description><![CDATA[
@@ -15,8 +15,7 @@
     ]]></description>
 
   <change-notes><![CDATA[
-     1.Add support for formatting JSON String </br>
-     2.Rename tab name `JSON Converter` to `Annotation` </br>
+     1.Optimize auto input class name logic when only one class name in the kotlin file </br>
     ]]>
   </change-notes>
 

src/wu/seal/jsontokotlin/JsonToKotlinApplication.kt

@@ -10,7 +10,7 @@ import wu.seal.jsontokotlin.feedback.sendHistoryActionInfo
  * Created by Seal.wu on 2017/8/21.
  */
 
-const val PLUGIN_VERSION = "1.6.2"
+const val PLUGIN_VERSION = "1.6.3"
 
 class JsonToKotlinApplication : ApplicationComponent {
 

src/wu/seal/jsontokotlin/MakeKotlinClassAction.kt

@@ -145,7 +145,7 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
 
     internal fun getCleanText(editorText: String): String {
         val tempCleanText = editorText.substringBeforeLast("class")
-        val cleanText = if (tempCleanText.trim().endsWith("data")) tempCleanText.removeSuffix("data") else tempCleanText
+        val cleanText = if (tempCleanText.trim().endsWith("data")) tempCleanText.trim().removeSuffix("data") else tempCleanText
         return cleanText
     }
 
@@ -160,11 +160,15 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
         var couldGetAndReuseClassNameInCurrentEditFileForInsertCode = false
         val removeCommentEditorText = editorText.replace(Regex("/*\\*(.|\n)*\\*/"),"")
                 .replace(Regex("^(?:\\s*package |\\s*import ).*$",RegexOption.MULTILINE),"")
-        if (removeCommentEditorText.indexOf("class") == removeCommentEditorText.lastIndexOf("class")
+        if ((removeCommentEditorText.indexOf("class") == removeCommentEditorText.lastIndexOf("class")
                 && removeCommentEditorText.indexOf("class") != -1
                 && removeCommentEditorText.substringAfter("class").contains("(").not()
                 && removeCommentEditorText.substringAfter("class").contains(":").not()
-                && removeCommentEditorText.substringAfter("class").contains("=").not()) {
+                && removeCommentEditorText.substringAfter("class").contains("=").not())
+                ||(removeCommentEditorText.indexOf("class") == removeCommentEditorText.lastIndexOf("class")
+                && removeCommentEditorText.indexOf("class") != -1
+                &&removeCommentEditorText.substringAfter("class").substringAfter("(")
+                .replace(Regex("\\s"),"").let { it.equals(")")||it.equals("){}") })) {
             couldGetAndReuseClassNameInCurrentEditFileForInsertCode = true
         }
         return couldGetAndReuseClassNameInCurrentEditFileForInsertCode

src/wu/seal/jsontokotlin/ui/JsonInputDialog.kt

@@ -49,7 +49,7 @@ val myInputValidator = MyInputValidator()
 /**
  * Json input Dialog
  */
-class JsonInputDialog(private val classsName: String, project: Project) : Messages.InputDialog(project, "Please input the class name and JSON String for generating Kotlin data class", "Make Kotlin Data Class", Messages.getInformationIcon(), "", myInputValidator) {
+class JsonInputDialog(private val classsName: String, project: Project) : Messages.InputDialog(project, "Please input the class name and JSON String for generating Kotlin data class", "Make Kotlin Data Class Code", Messages.getInformationIcon(), "", myInputValidator) {
 
     private lateinit var classNameInput: JTextField
 

test/wu/seal/jsontokotlin/MakeKotlinClassActionTest.kt

@@ -52,6 +52,42 @@ class MakeKotlinClassActionTest {
         action.couldGetAndReuseClassNameInCurrentEditFileForInsertCode(emptyString).should.be.`true`
     }
 
+    @Test
+    fun couldGetAndReuseClassNameInCurrentEditFileForInsertCodeWithClassBodyOnlyParentheses() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test()"""
+        action.couldGetAndReuseClassNameInCurrentEditFileForInsertCode(emptyString).should.be.`true`
+    }
+
+    @Test
+    fun couldGetAndReuseClassNameInCurrentEditFileForInsertCodeWithClassBodyOnlyParenthesesAndCurlyBraces() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test(){     }"""
+        action.couldGetAndReuseClassNameInCurrentEditFileForInsertCode(emptyString).should.be.`true`
+    }
+
+    @Test
+    fun couldGetAndReuseClassNameInCurrentEditFileForInsertCodeWithClassBodyWithProperty() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test(val a:String="1")"""
+        action.couldGetAndReuseClassNameInCurrentEditFileForInsertCode(emptyString).should.be.`false`
+    }
+
+    @Test
+    fun couldGetAndReuseClassNameInCurrentEditFileForInsertCodeWithClassBodyWithFunction() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test{fun c(){}}"""
+        action.couldGetAndReuseClassNameInCurrentEditFileForInsertCode(emptyString).should.be.`false`
+    }
+
     @Test
     fun couldGetAndReuseClassNameInCurrentEditFileForInsertCodeForPackageAndNotOnlyOneClassNameDeclare() {
         val action = MakeKotlinClassAction()
@@ -117,6 +153,15 @@ class MakeKotlinClassActionTest {
     }
 
 
+    @Test
+    fun getCurrentEditFileTemClassNameForInsertCodeWithClassBodyOnlyParentheses() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test()"""
+        action.getCurrentEditFileTemClassName(emptyString).should.be.equal("Test")
+    }
+
     @Test
     fun getCurrentEditFileTemClassNameForPackageAndOnlyOneClassNameWithCommentContainsClassStringDeclare() {
         val action = MakeKotlinClassAction()
@@ -170,6 +215,23 @@ class MakeKotlinClassActionTest {
     }
 
 
+    @Test
+    fun getCleanTextForInsertCodeWithClassBodyOnlyParentheses() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test()"""
+        action.getCleanText(emptyString).trim().should.be.equal("package wu.seal.jsontokotlin.supporter")
+    }
+
+    @Test
+    fun getCleanTextForInsertCodeWithClassBodyOnlyParenthesesAndCurlyBraces() {
+        val action = MakeKotlinClassAction()
+        val emptyString = """
+                            package wu.seal.jsontokotlin.supporter
+                            class Test(){     }"""
+        action.getCleanText(emptyString).trim().should.be.equal("package wu.seal.jsontokotlin.supporter")
+    }
     @Test
     fun getCleanTextForPackageAndOnlyOneClassNameWithCommentContainsClassStringDeclare() {
         val action = MakeKotlinClassAction()