Fix bug #114

Optimize usage experience with `Tab` keyboard to switch from class name input to json content input

Author: sealkingking

src/main/kotlin/extensions/wu/seal/PropertyPrefixSupport.kt

@@ -57,7 +57,7 @@ object PropertyPrefixSupport : Extension() {
 
 
     override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
-        return if (getConfig(prefixKeyEnable).toBoolean()) {
+        return if (getConfig(prefixKeyEnable).toBoolean() && getConfig(prefixKey).isNotEmpty()) {
             val originProperties = kotlinDataClass.properties
             val newProperties = originProperties.map {
                 val prefix = getConfig(prefixKey)

src/main/kotlin/extensions/wu/seal/PropertySuffixSupport.kt

@@ -22,6 +22,7 @@ object PropertySuffixSupport : Extension() {
             addFocusListener(object : FocusListener {
                 override fun focusGained(e: FocusEvent?) {
                 }
+
                 override fun focusLost(e: FocusEvent?) {
                     if (getConfig(suffixKeyEnable).toBoolean()) {
                         setConfig(suffixKey, text)
@@ -46,17 +47,17 @@ object PropertySuffixSupport : Extension() {
                 suffixJField()
             }
         }.apply {
-            border = JBEmptyBorder(6,0,0,0)
+            border = JBEmptyBorder(6, 0, 0, 0)
         }
     }
 
 
     override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
-        return if (getConfig(suffixKeyEnable).toBoolean()) {
+        return if (getConfig(suffixKeyEnable).toBoolean() && getConfig(suffixKey).isNotEmpty()) {
             val originProperties = kotlinDataClass.properties
             val newProperties = originProperties.map {
                 val suffix = getConfig(suffixKey)
-                val newName = it.name + suffix.first().toUpperCase() +suffix.substring(1)
+                val newName = it.name + suffix.first().toUpperCase() + suffix.substring(1)
                 it.copy(name = newName)
             }
             kotlinDataClass.copy(properties = newProperties)

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

@@ -5,6 +5,7 @@ import com.intellij.json.JsonFileType
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.fileChooser.FileChooser
 import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.progress.util.DispatchThreadProgressWindow
@@ -22,9 +23,7 @@ import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.Toolkit
 import java.awt.datatransfer.DataFlavor
-import java.awt.event.ActionEvent
-import java.awt.event.KeyAdapter
-import java.awt.event.KeyEvent
+import java.awt.event.*
 import java.net.URL
 import javax.swing.*
 import javax.swing.text.JTextComponent
@@ -128,7 +127,7 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
 
     private fun createJsonContentEditor(): Editor {
         val editorFactory = EditorFactory.getInstance()
-        val document = editorFactory.createDocument("").apply {  }
+        val document = editorFactory.createDocument("").apply { }
         document.setReadOnly(false)
         document.addDocumentListener(object : com.intellij.openapi.editor.event.DocumentListener {
             override fun documentChanged(event: com.intellij.openapi.editor.event.DocumentEvent?) = revalidate()
@@ -141,8 +140,20 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
         component.isEnabled = true
         component.preferredSize = Dimension(640, 480)
         component.autoscrolls = true
+        component.addFocusListener(object : FocusListener{
+            override fun focusLost(e: FocusEvent?) {
 
-        editor.contentComponent.componentPopupMenu = JPopupMenu().apply {
+            }
+
+            override fun focusGained(e: FocusEvent?) {
+               component.isFocusCycleRoot =true
+
+            }
+        })
+
+        val contentComponent = editor.contentComponent
+        contentComponent.isFocusable = true
+        contentComponent.componentPopupMenu = JPopupMenu().apply {
             add(createPasteFromClipboardMenuItem())
             add(createRetrieveContentFromHttpURLMenuItem())
             add(createLoadFromLocalFileMenu())
@@ -210,7 +221,7 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
     override fun getInputString(): String = if (exitCode == 0) jsonContentEditor.document.text.trim() else ""
 
     override fun getPreferredFocusedComponent(): JComponent? {
-        return if (this.myField.text?.isEmpty() != false) {
+        return if (this.myField.text.isNullOrEmpty()) {
             this.myField
         } else {
             jsonContentEditor.contentComponent