新增获取占位符列表

Author: dengzii

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

@@ -1,5 +1,7 @@
 package com.dengzii.plugin.template.model
 
+import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
+
 class FileTreeDsl() : FileTreeNode() {
 
     constructor(block: FileTreeDsl.() -> Unit) : this() {
@@ -27,27 +29,37 @@ class FileTreeDsl() : FileTreeNode() {
             this(block)
             return
         }
-        val realPath = getRealName(path)
-        var dirs = when {
-            realPath.contains(".") -> realPath.split(".")
-            realPath.contains("/") -> realPath.split("/")
-            else -> {
-                val newNode = FileTreeNode(this, realPath, true)
-                if (addChild(newNode)) {
-                    newNode(block)
-                }
-                return
-            }
+        path.getPlaceholder().ifNotEmpty {
+            allPlaceholder.addAll(this)
         }
-        dirs = dirs.filter {
-            it.isNotBlank()
-        }.toMutableList()
-        val domain = createDirs(dirs, this)
-        domain.invoke(block)
+//        val realPath = getRealName(path)
+//        var dirs = when {
+//            realPath.contains(".") -> realPath.split(".")
+//            realPath.contains("/") -> realPath.split("/")
+//            else -> {
+//                val newNode = FileTreeNode(this, realPath, true)
+//                if (addChild(newNode)) {
+//                    newNode(block)
+//                }
+//                return
+//            }
+//        }
+//        dirs = dirs.filter {
+//            it.isNotBlank()
+//        }.toMutableList()
+        val newNode = FileTreeNode(this, path, true)
+        if (addChild(newNode)) {
+            newNode.invoke(block)
+        }
+//        val domain = createDirs(dirs, this)
+//        domain.invoke(block)
     }
 
     fun FileTreeNode.file(name: String) {
         if (!isDir) return
+        name.getPlaceholder().ifNotEmpty {
+            allPlaceholder.addAll(this)
+        }
         addChild(FileTreeNode(this, name, false))
     }
 

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

@@ -3,6 +3,7 @@
 package com.dengzii.plugin.template.model
 
 import com.dengzii.plugin.template.utils.Logger
+import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
 import java.io.File
 import java.util.*
 import java.util.regex.Pattern
@@ -28,6 +29,8 @@ open class FileTreeNode() {
         get() = realChildren
 
     var placeholders: MutableMap<String, String>? = null
+    // all placeholder in tree node name
+    val allPlaceholder by lazy { mutableListOf<String>() }
 
     // template for node, higher priority than fileTemplates
     private var template: String? = null
@@ -47,6 +50,7 @@ open class FileTreeNode() {
 
         private val TAG = FileTreeNode::class.java.simpleName
         private val sPathSplitPattern = Pattern.compile("[./]")
+        private val sPlaceholderPattern = Pattern.compile("\\$\\{([A-Za-z0-9_\\-]+)}")
 
         fun root(path: String): FileTreeNode {
             val root = File(path)
@@ -64,6 +68,9 @@ open class FileTreeNode() {
         this.name = name
         this.parent = parent
         this.isDir = isDir
+        name.getPlaceholder().ifNotEmpty {
+            allPlaceholder.addAll(this)
+        }
     }
 
     fun removeFromParent(): Boolean {
@@ -142,12 +149,6 @@ open class FileTreeNode() {
         this.placeholders!!.putAll(placeholders)
     }
 
-//    fun getAllPlaceholderInName(): Map<String, String> {
-//        val result = mutableMapOf<String, String>()
-//        traversal({ fileTreeNode: FileTreeNode, i: Int ->
-//
-//        })
-//    }
 
     fun addFileTemplates(placeholders: Map<String, String>) {
         if (this.fileTemplates == null) {
@@ -237,8 +238,22 @@ open class FileTreeNode() {
         return this == parent
     }
 
-    fun getAllPlaceholders(): Map<String, String> {
+    fun build() {
+
+    }
+
+    fun getAllPlaceholderInTree(): List<String> {
+        val result = mutableListOf<String>()
+        result.addAll(allPlaceholder)
+        traversal({ fileTreeNode: FileTreeNode, _: Int ->
+            result.addAll(fileTreeNode.allPlaceholder)
+        })
+        return result
+    }
+
+    fun getAllPlaceholdersMap(): Map<String, String> {
         val result = mutableMapOf<String, String>()
+        result.putAll(placeholders.orEmpty())
         traversal({ fileTreeNode: FileTreeNode, _: Int ->
             if (fileTreeNode.placeholders != null) {
                 result.putAll(fileTreeNode.placeholders!!)
@@ -333,6 +348,15 @@ open class FileTreeNode() {
         return "FileTreeNode(path='${getPath()}' isDir=$isDir, fileTemplate=${getTemplateFile()}, children=${children.size})"
     }
 
+    protected fun String.getPlaceholder(): List<String> {
+        val result = mutableListOf<String>()
+        val nameMatcher = sPlaceholderPattern.matcher(this)
+        while (nameMatcher.find()) {
+            result.add(nameMatcher.group(1))
+        }
+        return result
+    }
+
     private fun String.replacePlaceholder(placeholders: Map<String, String>?, capitalize: Boolean = false): String {
         var after = this
         if (placeholders.isNullOrEmpty()) {

test/AucTemplateTest.kt

@@ -8,6 +8,11 @@ class AucTemplateTest {
     @Test
     fun aucAppModuleTest() {
         val app = AucTemplate.APP
+        app {
+            placeholder("PACKAGE_NAME", "com.dengzii.plugin")
+        }
+        println(app.placeholders)
+        println(app.getAllPlaceholderInTree())
         println(app.getTreeGraph())
 
     }

test/FileTreeDslTest.kt

@@ -1,17 +1,10 @@
 package test
 
 import com.dengzii.plugin.template.model.FileTreeDsl
-import com.dengzii.plugin.template.model.FileTreeNode
-import com.dengzii.plugin.template.template.Template
 import org.junit.Test
 
 class FileTreeDslTest {
 
-    @Test
-    fun traversalTest() {
-
-    }
-
     @Test
     fun createSimpleFileTreeTest() {
         val tree = FileTreeDsl {