fix: file tree node creation problem

Author: dengzii

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.dengzii.plugin.template</id>
     <name>Generate Module From Template</name>
-    <version>1.6.6</version>
+    <version>1.6.8</version>
     <vendor email="[email protected]" url="https://github.com/dengzii">dengzi</vendor>
 
     <description><![CDATA[
@@ -43,8 +43,8 @@ Any question please <a href='https://github.com/dengzii/GenerateModuleFromTempla
     ]]></description>
 
     <change-notes><![CDATA[
-    <b>Version 1.6.6 (2024/02/21)</b><br>
-    1. Fix: file tree node resolve order incorrect.<br>
+    <b>Version 1.6.8 (2024/02/21)</b><br>
+    1. Fix: file tree node creation problem.<br>
     <b>Version 1.6.5 (2023/12/11)</b><br>
     1. Update: File template support match by file path.<br>
     2. Fix: ApacheVelocity template lang not work.<br>

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

@@ -53,6 +53,8 @@ open class FileTreeNode() {
     @Transient
     var context: VelocityContext? = null
 
+    var resolvedFileTemplates: MutableMap<String, String>? = null
+
     // flag whether the node is resolved, if true, represents the node info has been resolved via the velocity engine or placeholders.
     @Transient
     var resolved: Boolean = false
@@ -224,9 +226,9 @@ open class FileTreeNode() {
     }
 
     fun getPlaceholderInherit(): MutableMap<String, String>? {
-        return parent?.getPlaceholderInherit()?.apply {
-            putAll(placeholders.orEmpty())
-        } ?: placeholders ?: mutableMapOf()
+        val r = parent?.getPlaceholderInherit() ?: mutableMapOf()
+        r.putAll(placeholders ?: mapOf())
+        return r
     }
 
     /**
@@ -266,7 +268,7 @@ open class FileTreeNode() {
         resolveTreeFileName()
         resolveFileTemplate()
         traversal({ it, _ ->
-            it.resolved = true
+            it.resolve()
         })
     }
 

test/com/dengzii/plugin/template/model/FileTreeNodeTest.kt

@@ -89,7 +89,7 @@ class FileTreeNodeTest : TestCase() {
 
     fun testAppcacheVelocity() {
         val r = """
-            !{StringUtils.removeAndHump(!{FEATURE_NAME.replaceAll("[^\w]", "_")})}Module.kt
+            !{StringUtils.removeAndHump(FEATURE_NAME.replaceAll("[^\w]", "_"))}Module.kt
         """.replace("!", "\$")
 
         val dsl = FileTreeDsl {