Merge pull request #196 from wuseal/3.3.0

3.3.0 Released then merge it into master branch

Author: wuseal

README.md

@@ -183,20 +183,22 @@ Open the `build.gradle` in IntelliJ, open "Gradle" tool window, expand the proje
 * Share to others to help more people have a better develope expierience :heart:
 
 ### Authors
-* This project exists thanks to all the people who contribute.
+This project exists thanks to all the people who contribute.
 
 <a href="https://github.com/wuseal/JsonToKotlinClass/graphs/contributors"><img src="https://opencollective.com/jsontokotlin/contributors.svg?width=890" /></a>
 
 ### Acknowledgement
 
-* The development of this plugin is powerly driven by JetBrains.
+The development of this plugin is powerly driven by JetBrains.
 
 ### Join the Community
 
 | QQ Group |
 | -------- |
 | ![QQ Group](qq_qrcode.png "Scan QR code with QQ/TIM to join the group chat")
 
+### Note：
+We analytics anonymous user behavior for improving plugin production, If you don't want this behavior enable, please contact us, we will provide a switch case for that.
 ### Stargazers over time
 
 [![Stargazers over time](https://starcharts.herokuapp.com/wuseal/JsonToKotlinClass.svg)](https://starcharts.herokuapp.com/wuseal/JsonToKotlinClass)

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'wu.seal'
-version '3.2.0'
+version '3.3.0'
 
 intellij {
     version '2017.1'
@@ -43,7 +43,9 @@ repositories {
 }
 
 dependencies {
-    compile 'com.squareup:kotlinpoet:1.1.0'
+    compile ('com.squareup:kotlinpoet:1.1.0'){
+        exclude group: "org.jetbrains.kotlin"
+    }
 
     testImplementation('com.winterbe:expekt:0.5.0') {
         exclude group: "org.jetbrains.kotlin"

src/main/kotlin/extensions/Extension.kt

@@ -56,7 +56,7 @@ abstract class Extension : IImportClassDeclarationInterceptor, IKotlinDataClassI
         }
 
         fun getConfig(key: String): String {
-            return getConfig(key)
+            return extension.getConfig(key)
         }
     }
 }

src/main/kotlin/extensions/ExtensionsCollector.kt

@@ -1,8 +1,11 @@
 package extensions
 
+import extensions.chen.biao.KeepAnnotationSupport
+import extensions.ted.zeng.PropertyAnnotationLineSupport
+import extensions.wu.seal.ClassNameSuffixSupport
 import extensions.wu.seal.PropertyPrefixSupport
 import extensions.wu.seal.PropertySuffixSupport
-import extensions.chen.biao.KeepAnnotationSupport
+
 /**
  * extension collect, all extensions will be hold by this class's extensions property
  */
@@ -11,8 +14,10 @@ object ExtensionsCollector {
      * all extensions
      */
     val extensions = listOf(
-            PropertyPrefixSupport,
-            PropertySuffixSupport,
-            KeepAnnotationSupport
+        PropertyPrefixSupport,
+        PropertySuffixSupport,
+        KeepAnnotationSupport,
+        PropertyAnnotationLineSupport,
+        ClassNameSuffixSupport
     )
 }

src/main/kotlin/extensions/ted/zeng/PropertyAnnotationLineSupport.kt

@@ -0,0 +1,36 @@
+package extensions.ted.zeng
+
+import com.intellij.ui.layout.verticalPanel
+import extensions.Extension
+import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
+import wu.seal.jsontokotlin.classscodestruct.Property
+import javax.swing.JCheckBox
+import javax.swing.JPanel
+
+/**
+ * Created by ted on 2019-06-13 18:10.
+ */
+object PropertyAnnotationLineSupport : Extension() {
+
+    private const val enable = "ted.zeng.property_annotation_in_same_line_enable"
+
+    override fun createUI(): JPanel {
+        val checkBox = JCheckBox("Keep Annotation And Property In Same Line").apply {
+            isSelected = getConfig(enable).toBoolean()
+            addActionListener {
+                setConfig(enable, isSelected.toString())
+            }
+        }
+        return verticalPanel {
+            checkBox()
+        }
+    }
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+        if (getConfig(enable).toBoolean()) {
+            kotlinDataClass.properties.forEach(Property::letLastAnnotationStayInSameLine)
+        }
+        return kotlinDataClass
+    }
+
+}

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

@@ -0,0 +1,117 @@
+package extensions.wu.seal
+
+import com.intellij.ui.layout.panel
+import com.intellij.util.ui.JBDimension
+import com.intellij.util.ui.JBEmptyBorder
+import extensions.Extension
+import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
+import wu.seal.jsontokotlin.utils.getChildType
+import wu.seal.jsontokotlin.utils.getRawType
+import java.awt.event.FocusEvent
+import java.awt.event.FocusListener
+import javax.swing.JCheckBox
+import javax.swing.JPanel
+import javax.swing.JTextField
+
+object ClassNameSuffixSupport : Extension() {
+
+    private const val suffixKeyEnable = "wu.seal.class_name_suffix_enable"
+    private const val suffixKey = "wu.seal.class_name_suffix"
+
+    override fun createUI(): JPanel {
+        val prefixJField = JTextField().apply {
+            text = getConfig(suffixKey)
+
+            addFocusListener(object : FocusListener {
+                override fun focusGained(e: FocusEvent?) {
+                }
+
+                override fun focusLost(e: FocusEvent?) {
+                    if (getConfig(suffixKeyEnable).toBoolean()) {
+                        setConfig(suffixKey, text)
+                    }
+                }
+            })
+
+            minimumSize = JBDimension(150, 25)
+
+            isEnabled = getConfig(suffixKeyEnable).toBoolean()
+
+        }
+
+        val checkBox = JCheckBox("Suffix append after every class name: ").apply {
+            isSelected = getConfig(suffixKeyEnable).toBoolean()
+            addActionListener {
+                setConfig(suffixKeyEnable, isSelected.toString())
+                prefixJField.isEnabled = isSelected
+            }
+        }
+
+        return panel {
+            row {
+                checkBox()
+                prefixJField()
+            }
+        }.apply {
+            border = JBEmptyBorder(6, 0, 0, 0)
+        }
+    }
+
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+
+        val suffix = getConfig(suffixKey)
+
+        return if (getConfig(suffixKeyEnable).toBoolean() && suffix.isNotEmpty()) {
+            val standTypes = listOf("Int", "Double", "Long", "String", "Boolean")
+            val originName = kotlinDataClass.name
+            val newPropertyTypes =
+                kotlinDataClass.properties.map {
+                    val rawSubType = getChildType(getRawType(it.type))
+                    when {
+                        it.type.isMapType() -> {
+                            it.type//currently don't support map type
+                        }
+                        standTypes.contains(rawSubType) -> it.type
+                        else -> it.type.replace(rawSubType, rawSubType + suffix)
+                    }
+                }
+
+            val newPropertyDefaultValues = kotlinDataClass.properties.map {
+                val rawSubType = getChildType(getRawType(it.type))
+                when {
+                    it.value.isEmpty()-> it.value
+                    it.type.isMapType() -> {
+                        it.value//currently don't support map type
+                    }
+                    standTypes.contains(rawSubType) -> it.value
+                    else -> it.value.replace(rawSubType, rawSubType + suffix)
+                }
+            }
+
+            val newProperties = kotlinDataClass.properties.mapIndexed { index, property ->
+
+                val newType = newPropertyTypes[index]
+
+                val newValue = newPropertyDefaultValues[index]
+
+                property.copy(type = newType,value = newValue)
+            }
+
+
+            kotlinDataClass.copy(name = originName + suffix, properties = newProperties)
+
+        } else {
+            kotlinDataClass
+        }
+
+    }
+
+    private fun String.isMapType(): Boolean {
+
+        return matches(Regex("Map<.+,.+>"))
+    }
+
+
+}
+

src/main/kotlin/wu/seal/jsontokotlin/ConfigManager.kt

@@ -35,13 +35,6 @@ object ConfigManager : IConfigManager {
             TestConfig.enableMapType = value
         } else PropertiesComponent.getInstance().setValue(ENABLE_MAP_TYP_KEY, value, false)
 
-    var enableAutoReformat: Boolean
-        get() = (TestConfig.isTestModel && TestConfig.enableAutoReformat)
-                || PropertiesComponent.getInstance().getBoolean(ENABLE_AUTO_REFORMAT, true)
-        set(value) = if (TestConfig.isTestModel) {
-            TestConfig.enableAutoReformat = value
-        } else PropertiesComponent.getInstance().setValue(ENABLE_AUTO_REFORMAT, value, true)
-
     var enableMinimalAnnotation: Boolean
         get() = if (TestConfig.isTestModel) {
             TestConfig.enableMinimalAnnotation

src/main/kotlin/wu/seal/jsontokotlin/DefaultValueStrategy.kt

@@ -0,0 +1,5 @@
+package wu.seal.jsontokotlin
+
+enum class DefaultValueStrategy {
+    AvoidNull, AllowNull, None
+}

src/main/kotlin/wu/seal/jsontokotlin/GenerateKotlinFileAction.kt

@@ -21,7 +21,7 @@ import wu.seal.jsontokotlin.utils.KotlinDataClassFileGenerator
 /**
  * Created by Seal.Wu on 2018/4/18.
  */
-class GenerateKotlinFileAction : AnAction("GenerateKotlinClassFile") {
+class GenerateKotlinFileAction : AnAction("Kotlin data class File from JSON") {
 
     override fun actionPerformed(event: AnActionEvent) {
         var jsonString = ""