fix: placeholder don't work when call FileTreeNode.include

Author: dengzii

resources/META-INF/plugin.xml

@@ -51,7 +51,6 @@ Any question please <a href='https://github.com/dengzii/GenerateModuleFromTempla
 
     <extensions defaultExtensionNs="com.intellij">
         <fileTemplateGroup implementation="com.dengzii.plugin.template.template.FileTemplateFactory" order="first"/>
-        <internalFileTemplate name="AndroidManifest" id="com.dengzii.plugin.template.ft.manifest"/>
         <applicationConfigurable groupId="tools" displayName="Module Template Settings"
                                  id="preferences.ModuleTemplateConfig"
                                  instance="com.dengzii.plugin.template.TemplateConfigurable"/>

resources/fileTemplates/Template AndroidManifest.xml.ft

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="${PACKAGE_NAME}.${FEATURE_NAME}.${MODULE_NAME}">
+
+    <application>
+
+    </application>
+
+</manifest>

resources/fileTemplates/Template Manifest.xml.ft

@@ -88,7 +88,7 @@ open class FileTreeNode private constructor() {
                 Logger.d(TAG, "node has already exists $child")
                 return false
             } else {
-                Logger.d(TAG, "override node ${child.getPath()}")
+                Logger.w(TAG, "THE SAME CHILE ALREADY EXISTS IN $name: ${child.name}")
             }
         }
         child.parent = this
@@ -206,11 +206,26 @@ open class FileTreeNode private constructor() {
 
     /**
      * merge all children of another node to this.
+     * all placeholders and file templates of target node
+     * will be copied to it's each children
      */
     fun include(other: FileTreeNode, override: Boolean = false) {
         if (!isDir) return
         other.children.forEach {
-            addChild(it.clone(), override)
+            val clone = it.clone()
+            if (other.placeholders != null) {
+                if (clone.placeholders == null) {
+                    clone.placeholders = mutableMapOf()
+                }
+                clone.placeholders?.putAll(other.placeholders!!)
+            }
+            if (other.fileTemplates != null) {
+                if (clone.fileTemplates == null) {
+                    clone.fileTemplates = mutableMapOf()
+                }
+                clone.fileTemplates?.putAll(other.fileTemplates!!)
+            }
+            addChild(clone, override)
         }
     }
 

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

@@ -10,15 +10,14 @@ import com.dengzii.plugin.template.model.FileTreeNode
  * time   : 2019/1/1
  * desc   :
 </pre> */
-
 object AucTemplate {
 
     private val aucFileTemplates: () -> MutableMap<String, String> = {
         mutableMapOf(
-                Pair("AndroidManifest.xml", "Template AndroidManifest.xml"),
-                Pair("Application.java", "Template App.java"),
+                Pair("AndroidManifest.xml", "Template Manifest.xml"),
+                Pair("Application.java", "Template Application.java"),
                 Pair("build.gradle", "Template build.gradle"),
-                Pair("\${APPLICATION_NAME}.java", "Template App.java")
+                Pair("\${APPLICATION_NAME}.java", "Template Application.java")
         )
     }
 
@@ -35,7 +34,7 @@ object AucTemplate {
         placeholders(aucPlaceholders())
         placeholder("MODULE_NAME", "app")
 
-        module_name {
+        dir("app") {
             src {
                 main {
                     java {
@@ -63,15 +62,14 @@ object AucTemplate {
         fileTemplates(aucFileTemplates())
         placeholders(aucPlaceholders())
         placeholder("MODULE_NAME", "pkg")
-        module_name {
+        dir("pkg") {
             src {
                 main {
                     java {
                         pkg_name {
                             feature_name {
                                 module_name {
-                                    main {}
-                                    file("\${MODULE_NAME}ApiImpl.java")
+                                    file("\${FEATURE_NAME}ApiImpl.java")
                                 }
 
                             }
@@ -91,15 +89,15 @@ object AucTemplate {
         fileTemplates(aucFileTemplates())
         placeholders(aucPlaceholders())
         placeholder("MODULE_NAME", "export")
-        module_name {
+        dir("export") {
             src {
                 main {
                     java {
                         pkg_name {
                             feature_name {
                                 module_name {
                                     dir("api") {
-                                        file("\${MODULE_NAME}Api.java")
+                                        file("\${FEATURE_NAME}Api.java")
                                     }
                                     dir("bean")
                                 }

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

@@ -20,9 +20,8 @@ class FileTemplateFactory : FileTemplateGroupDescriptorFactory {
     override fun getFileTemplatesDescriptor(): FileTemplateGroupDescriptor {
 
         val descriptor = FileTemplateGroupDescriptor("Module Template Plugin Descriptor", AllIcons.Nodes.Plugin)
-        val manifestDesc = FileTemplateDescriptor("AndroidManifest.xml", StdFileTypes.XML.icon)
+        val manifestDesc = FileTemplateDescriptor("Manifest.xml", StdFileTypes.XML.icon)
         val applicationDesc = FileTemplateDescriptor("Application.java", StdFileTypes.JAVA.icon)
-        val applicationDescKt = FileTemplateDescriptor("Application.kt", StdFileTypes.JAVA.icon)
         descriptor.addTemplate(applicationDesc)
         descriptor.addTemplate(manifestDesc)
         return descriptor

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

@@ -41,7 +41,7 @@ object Template {
         placeholder("PACKAGE_NAME", "com.example")
 
         fileTemplate("MainActivity.java", "Template MainActivity.java")
-        fileTemplate("AndroidManifest.xml", "Template AndroidManifest.xml")
+        fileTemplate("AndroidManifest.xml", "Template Manifest.xml")
         fileTemplate("build.gradle", "Template build.gradle")
 
         module_name {

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

@@ -1,6 +1,7 @@
 package com.dengzii.plugin.template.utils
 
 import com.jetbrains.rd.util.printlnError
+import java.text.SimpleDateFormat
 
 /**
  * <pre>
@@ -14,6 +15,7 @@ import com.jetbrains.rd.util.printlnError
 object Logger {
 
     var enable: Boolean = true
+    var timeFormatter = SimpleDateFormat("MM-dd hh:mm:ss")
 
     fun e(tag: String, log: String) {
         log("e", tag, log)
@@ -32,15 +34,24 @@ object Logger {
         log("d", tag, log)
     }
 
+    fun w(tag: String, log: String) {
+        log("w", tag, log)
+    }
+
     private fun log(level: String, tag: String, log: String) {
         if (!enable) {
             return
         }
-        val logStr = "${level.toUpperCase()}/$tag: $log"
+
+        val logStr = "${getTime()} ${level.toUpperCase()}/$tag: $log"
         if (level == "e") {
             printlnError(logStr)
             return
         }
         println(logStr)
     }
+
+    private fun getTime(): String {
+        return timeFormatter.format(System.currentTimeMillis())
+    }
 }