fix: file template doesn't work.

Author: dengzii

src/com/dengzii/plugin/template/model/FileTreeDsl.kt

@@ -35,8 +35,10 @@ class FileTreeDsl() : FileTreeNode() {
 
     fun FileTreeNode.file(name: String) {
         if (!isDir) return
-        if (name.getPlaceholder().isNotEmpty()) {
-            allPlaceholder.addAll(name.getPlaceholder())
+        name.getPlaceholder().forEach {
+            if (getPlaceholderInherit()?.containsKey(it) == false) {
+                placeholder(it, "")
+            }
         }
         addChild(FileTreeNode(this, name, false))
     }

src/com/dengzii/plugin/template/model/FileTreeNode.kt

@@ -29,9 +29,6 @@ open class FileTreeNode() {
 
     var placeholders: MutableMap<String, String>? = null
 
-    // all placeholder in tree node name
-    val allPlaceholder = mutableListOf<String>()
-
     // template for node, higher priority than fileTemplates
     private var template: String? = null
 
@@ -70,9 +67,6 @@ open class FileTreeNode() {
         this.name = name
         this.parent = parent
         this.isDir = isDir
-        if (name.getPlaceholder().isNotEmpty()) {
-            allPlaceholder.addAll(name.getPlaceholder())
-        }
     }
 
     fun getTreeNodeCount(): Int {
@@ -146,6 +140,21 @@ open class FileTreeNode() {
         }
     }
 
+    fun removeAllTemplateInTree() {
+        fileTemplates?.clear()
+        template = null
+        traversal({ it, _ ->
+            it.removeAllTemplateInTree()
+        })
+    }
+
+    fun removeAllPlaceHolderInTree() {
+        placeholders?.clear()
+        traversal({ it, _ ->
+            it.removeAllPlaceHolderInTree()
+        })
+    }
+
     /**
      * Return all file template in tree node
      */
@@ -169,11 +178,19 @@ open class FileTreeNode() {
     }
 
     fun getFileTemplateInherit(): MutableMap<String, String>? {
-        return fileTemplates ?: parent?.getFileTemplateInherit()
+        return if (fileTemplates.isNullOrEmpty()) {
+            return parent?.getFileTemplateInherit()
+        } else {
+            fileTemplates
+        }
     }
 
     fun getPlaceholderInherit(): MutableMap<String, String>? {
-        return placeholders ?: parent?.getPlaceholderInherit()
+        return if (placeholders.isNullOrEmpty()) {
+            return parent?.getPlaceholderInherit()
+        } else {
+            placeholders
+        }
     }
 
     fun getTemplateFile(): String? {
@@ -351,17 +368,6 @@ open class FileTreeNode() {
         }
     }
 
-    /**
-     * Return the placeholder key list in node tree.
-     */
-    fun getAllPlaceholderInTree(): List<String> {
-        val result = allPlaceholder.toMutableList()
-        traversal({ fileTreeNode: FileTreeNode, _: Int ->
-            result.addAll(fileTreeNode.allPlaceholder)
-        })
-        return result.toList()
-    }
-
     /**
      * Return the placeholder key/replacement map of the node tree.
      */

src/com/dengzii/plugin/template/template/Template.kt

@@ -33,14 +33,12 @@ object Template {
     }
 
     val EMPTY = FileTreeDsl {
-        file("src")
+
     }
 
     val ANDROID_MVP = FileTreeDsl {
         placeholder("MVP_NAME", "Example")
 
-//        fileTemplate("", "")
-
         file("\${MVP_NAME}Contract.java")
         file("\${MVP_NAME}View.java")
         file("\${MVP_NAME}Presenter.java")

src/com/dengzii/plugin/template/ui/EditableTable.kt

@@ -68,7 +68,7 @@ class EditableTable(header: Array<String>, colEditable: Array<Boolean> = emptyAr
         for (i in 0 until table.rowCount) {
             val key = table.getValueAt(i, 0).toString()
             val value = table.getValueAt(i, 1).toString()
-            if (key.isBlank() || value.isBlank()) {
+            if (key.isBlank()) {
                 continue
             }
             result[key] = value

src/com/dengzii/plugin/template/ui/PreviewPanel.kt

@@ -6,7 +6,6 @@ import com.dengzii.plugin.template.tools.ui.PopMenuUtils
 import com.dengzii.plugin.template.tools.ui.onRightMouseButtonClicked
 import com.dengzii.plugin.template.utils.Logger
 import com.intellij.icons.AllIcons
-import com.intellij.openapi.ui.JBMenuItem
 import com.intellij.packageDependencies.ui.TreeModel
 import com.intellij.ui.ColoredTreeCellRenderer
 import com.intellij.ui.components.JBScrollPane
@@ -17,7 +16,6 @@ import java.awt.event.*
 import java.util.*
 import java.util.function.Consumer
 import javax.swing.Icon
-import javax.swing.JDialog
 import javax.swing.JPanel
 import javax.swing.JTree
 import javax.swing.tree.DefaultMutableTreeNode
@@ -28,7 +26,7 @@ class PreviewPanel : JPanel() {
 
     private var fileTree: Tree = Tree()
 
-    private lateinit var module:Module
+    private lateinit var module: Module
     private val fileIconMap: MutableMap<String, Icon> = HashMap()
     private var replacePlaceholder = true
     private var onTreeUpdateListener: (() -> Unit)? = null

src/com/dengzii/plugin/template/ui/RealConfigurePanel.kt

@@ -48,8 +48,12 @@ class RealConfigurePanel : ConfigurePanel() {
 
     fun cacheConfig() {
         currentConfig ?: return
-        currentConfig!!.template.fileTemplates = tableFileTemp.getPairResult()
-        currentConfig!!.template.placeholders = tablePlaceholder.getPairResult()
+        currentConfig!!.template.run {
+            removeAllPlaceHolderInTree()
+            removeAllTemplateInTree()
+            fileTemplates = tableFileTemp.getPairResult()
+            placeholders = tablePlaceholder.getPairResult()
+        }
     }
 
     fun saveConfig() {
@@ -68,7 +72,6 @@ class RealConfigurePanel : ConfigurePanel() {
         panelFileTemp.add(tableFileTemp, BorderLayout.CENTER)
     }
 
-
     private fun initData() {
         actionbar.onAdd { e ->
             if (e != null) {
@@ -93,9 +96,12 @@ class RealConfigurePanel : ConfigurePanel() {
         tabbedPane.addChangeListener {
             currentConfig ?: return@addChangeListener
             when (tabbedPane.selectedIndex) {
-                0 -> currentConfig!!.template.placeholders = tablePlaceholder.getPairResult()
-                1 -> updateTableFileTemplate()
-                2 -> updateTablePlaceholder()
+                0 -> {
+                    currentConfig!!.template.placeholders = tablePlaceholder.getPairResult()
+                    currentConfig!!.template.fileTemplates = tableFileTemp.getPairResult()
+                }
+                1 -> tableFileTemp.setPairData(currentConfig!!.template.getAllTemplateMap())
+                2 -> tablePlaceholder.setPairData(currentConfig!!.template.getAllPlaceholdersMap().toMutableMap())
             }
             panelPreview.setModuleConfig(currentConfig!!)
         }
@@ -115,22 +121,6 @@ class RealConfigurePanel : ConfigurePanel() {
         }
     }
 
-    private fun updateTableFileTemplate() {
-        val fileTemplates = currentConfig!!.template.getAllTemplateMap()
-        tableFileTemp.setPairData(fileTemplates)
-    }
-
-    private fun updateTablePlaceholder() {
-        val mergedPlaceholder = currentConfig!!.template.getAllPlaceholdersMap().toMutableMap()
-        val allPlaceholders = currentConfig!!.template.getAllPlaceholderInTree()
-        allPlaceholders.forEach { s: String ->
-            if (s !in mergedPlaceholder) {
-                mergedPlaceholder[s] = ""
-            }
-        }
-        tablePlaceholder.setPairData(mergedPlaceholder)
-    }
-
     private fun addModuleTemplate(module: Module) {
         configs!!.add(module)
         templateListModel!!.addElement(module.templateName)
@@ -146,6 +136,17 @@ class RealConfigurePanel : ConfigurePanel() {
         val selectedIndex = getSelectedConfigIndex()
         configs!!.removeAt(selectedIndex)
         templateListModel!!.remove(selectedIndex)
+        if (!listTemplate.isEmpty) {
+            panelPreview.isEnabled = true
+            listTemplate.selectedIndex = 0
+            onConfigListSelected()
+        } else {
+            currentConfig = null
+            tablePlaceholder.setPairData(mapOf())
+            tableFileTemp.setPairData(mapOf())
+            panelPreview.setModuleConfig(getEmpty())
+            panelPreview.isEnabled = false
+        }
         listTemplate.doLayout()
     }
 

test/AucTemplateTest.kt

@@ -12,7 +12,7 @@ class AucTemplateTest {
             placeholder("PACKAGE_NAME", "com.dengzii.plugin")
         }
         println(app.placeholders)
-        println(app.getAllPlaceholderInTree())
+//        println(app.getAllPlaceholderInTree())
 
         app.build()
         println(app)

test/FileTreeDslTest.kt

@@ -122,6 +122,6 @@ class FileTreeDslTest {
                 dir("test")
             }
         }
-        println(tree.getAllPlaceholderInTree())
+//        println(tree.getAllPlaceholderInTree())
     }
 }