Merge remote-tracking branch 'github/master' into github_master

cairui · cairui · commit 586342243fdf · 2021-07-13T08:56:01.000+08:00
diff --git a/src/main/java/com/crzsc/plugin/actions/GenerateDirAction.kt b/src/main/java/com/crzsc/plugin/actions/GenerateDirAction.kt
@@ -0,0 +1,22 @@
+package com.crzsc.plugin.actions
+
+import com.crzsc.plugin.utils.FileGenerator
+import com.crzsc.plugin.utils.FileHelper.shouldActivateFor
+import com.crzsc.plugin.utils.PluginUtils.showNotify
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.PlatformDataKeys
+
+class GenerateDirAction : AnAction() {
+    private var fileGenerator: FileGenerator? = null
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.getData(PlatformDataKeys.PROJECT)
+        if (shouldActivateFor(project!!)) {
+            fileGenerator = fileGenerator ?: FileGenerator(project)
+            fileGenerator!!.buildYaml()
+        } else {
+            showNotify("This project is not the flutter project")
+        }
+    }
+}
diff --git a/src/main/java/com/crzsc/plugin/utils/FileGenerator.kt b/src/main/java/com/crzsc/plugin/utils/FileGenerator.kt
@@ -6,9 +6,16 @@ import com.crzsc.plugin.utils.PluginUtils.toLowCamelCase
 import com.crzsc.plugin.utils.PluginUtils.toUpperCaseFirst
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.kotlin.idea.core.util.toPsiFile
+import org.jetbrains.yaml.YAMLElementGenerator
+import org.jetbrains.yaml.psi.YAMLFile
+import org.jetbrains.yaml.psi.YAMLMapping
+import org.jetbrains.yaml.psi.YAMLSequence
 
 class FileGenerator(private val project: Project) {
     private val ignoreDir = listOf("2.0x", "3.0x", "Mx", "Nx")
@@ -78,6 +85,53 @@ class FileGenerator(private val project: Project) {
         }
     }
 
+    fun buildYaml() {
+        val guessProjectDir = project.guessProjectDir() ?: return
+        val assetsFile = guessProjectDir.children.firstOrNull { it.name == "assets" } ?: return
+        val fileAssetsDir =
+            FileHelper.getAssetsFiles(assetsFile)?.map { "${it.path}/".replaceFirst("${guessProjectDir.path}/", "") }
+                ?.toMutableList()?.takeIf { it.isNotEmpty() } ?: return
+        //由于本地修改后有几秒缓存，所以每次数据都修改，不判断是否有变动
+        /*al mergeDir=fileAssetsDir.toMutableList()
+        FileHelper.getPubSpecConfig(project)?.let { pubSpecConfig ->
+            (pubSpecConfig.map["flutter"] as? Map<*, *>)?.let { configureMap ->
+                val assets = (configureMap["assets"] as? ArrayList<*>) ?: return
+                assets.forEach { ass ->
+                    mergeDir.remove(ass)
+                }
+            }
+        }
+        if(mergeDir.isEmpty()){
+            println("-----没有需要添加的数据")
+            return
+        }*/
+        fileAssetsDir.forEach {
+            println("全部文件夹：$it")
+        }
+        val yaml = guessProjectDir.children.firstOrNull { it.name == "pubspec.yaml" } ?: return
+        val yamlFile = (yaml.toPsiFile(project) as? YAMLFile) ?: return
+        val psiElement =
+            yamlFile.node.getChildren(null)
+                .firstOrNull()?.psi?.children?.firstOrNull()?.children?.firstOrNull { it.text.startsWith("flutter:") }
+                ?: return
+        val yamlMapping = psiElement.children.first() as YAMLMapping
+        val assetsValue = yamlMapping.keyValues.firstOrNull { it.keyText == "assets" }?:return
+        WriteCommandAction.runWriteCommandAction(project) {
+            val stringBuilder = StringBuilder("assets:")
+            fileAssetsDir.forEach {
+                stringBuilder.append("\n    - $it")
+            }
+            val yamlValue = PsiTreeUtil.collectElementsOfType(
+                YAMLElementGenerator.getInstance(project)
+                    .createDummyYamlWithText(stringBuilder.toString()), YAMLSequence::class.java
+            ).iterator().next()
+            assetsValue.setValue(yamlValue)
+
+        }
+
+
+    }
+
     private fun checkName(name: String): Boolean {
         return !ignoreDir.contains(name)
     }
diff --git a/src/main/java/com/crzsc/plugin/utils/FileHelper.kt b/src/main/java/com/crzsc/plugin/utils/FileHelper.kt
@@ -1,11 +1,11 @@
 package com.crzsc.plugin.utils
 
+import com.crzsc.plugin.setting.PluginSetting
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.search.FilenameIndex
-import com.crzsc.plugin.setting.PluginSetting
 import io.flutter.pub.PubRoot
 import io.flutter.utils.FlutterModuleUtils
 import org.yaml.snakeyaml.Yaml
@@ -38,7 +38,30 @@ object FileHelper {
             return null
         }
         return guessProjectDir?.findChild(assetsPath!!)
-                ?: guessProjectDir!!.createChildDirectory(this, assetsPath!!)
+            ?: guessProjectDir!!.createChildDirectory(this, assetsPath!!)
+    }
+
+    /**
+     * 获取资源路径
+     */
+    @JvmStatic
+    fun getAssetsFiles(assetsFile: VirtualFile): List<VirtualFile>? {
+        val list = mutableListOf<VirtualFile>()
+        checkAddDir(list,assetsFile)
+        return list.takeIf { it.isNotEmpty() }
+    }
+
+    ///递归添加文件夹
+    private fun checkAddDir(list:MutableList<VirtualFile>,virtualFile: VirtualFile){
+        if (virtualFile.isDirectory) {
+            //不全是文件
+            if (virtualFile.children.any { c -> !c.isDirectory }) {
+                list.add(virtualFile)
+            }
+            virtualFile.children.forEach {
+                checkAddDir(list,it)
+            }
+        }
     }
 
     /**
@@ -53,13 +76,13 @@ object FileHelper {
             filePath = filePath.trim()
             if (!filePath.contains("/")) {
                 return@let lib.findChild(filePath)
-                        ?: lib.createChildDirectory(lib, filePath)
+                    ?: lib.createChildDirectory(lib, filePath)
             } else {
                 var file = lib
                 filePath.split("/").forEach { dir ->
                     if (dir.isNotEmpty()) {
                         file = file.findChild(dir)
-                                ?: file.createChildDirectory(file, dir)
+                            ?: file.createChildDirectory(file, dir)
                     }
                 }
                 return@let file
@@ -98,7 +121,7 @@ object FileHelper {
      */
     fun containsDirectoryFile(directory: PsiDirectory, fileName: String): Boolean {
         return directory.files.filter { it.name.endsWith(".dart") }
-                .firstOrNull { it.name.contains(fileName) } != null
+            .firstOrNull { it.name.contains(fileName) } != null
     }
 
     @Suppress("DuplicatedCode")
@@ -132,11 +155,12 @@ object FileHelper {
     private const val PROJECT_NAME = "name"
 
     data class PubSpecConfig(
-            val project: Project,
-            val pubRoot: PubRoot,
-            val map: Map<String, Any>,
-            //项目名称,导包需要
-            val name: String = ((if (map[PROJECT_NAME] == "null") null else map[PROJECT_NAME])
-                    ?: project.name).toString(),
-            val isFlutterModule: Boolean = FlutterModuleUtils.hasFlutterModule(project))
+        val project: Project,
+        val pubRoot: PubRoot,
+        val map: Map<String, Any>,
+        //项目名称,导包需要
+        val name: String = ((if (map[PROJECT_NAME] == "null") null else map[PROJECT_NAME])
+            ?: project.name).toString(),
+        val isFlutterModule: Boolean = FlutterModuleUtils.hasFlutterModule(project)
+    )
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -71,5 +71,9 @@
             <add-to-group group-id="BuildMenu" anchor="last"/>
             <keyboard-shortcut keymap="$default" first-keystroke="alt g"/>
         </action>
+        <action id="action.generateDir" class="com.crzsc.plugin.actions.GenerateDirAction" text="Generate Flutter Assets Dir"
+                description="Generate Assets dir">
+            <add-to-group group-id="BuildMenu" anchor="last"/>
+        </action>
     </actions>
 </idea-plugin>
