优化代码存储和 DartYamlModel 创建逻辑

Author: mdddj

.idea/dataSources.local.xml

@@ -1,6 +1,7 @@
 package shop.itbug.flutterx.common.yaml
 
 import com.intellij.openapi.application.readAction
+import com.intellij.psi.PsiInvalidElementAccessException
 import com.intellij.psi.SmartPointerManager
 import com.intellij.psi.SmartPsiElementPointer
 import com.intellij.psi.util.PsiTreeUtil
@@ -71,37 +72,49 @@ data class DartYamlModel(
 
     companion object {
 
-        suspend fun create(element: YAMLKeyValueImpl): DartYamlModel? {
-            // 在 readAction 内部进行所有 PSI 访问，避免元素在异步操作中失效
+        suspend fun create(elementPointer: SmartPsiElementPointer<YAMLKeyValueImpl>): DartYamlModel? {
+            // 1. 获取 project 时也要注意安全性
+            val project = try { elementPointer.project } catch (_: Exception) { return null }
+
             return readAction {
-                // 检查元素是否仍然有效
-                if (!element.isValid) return@readAction null
-                val pt = PsiTreeUtil.findChildOfType(element,YAMLPlainTextImpl::class.java) ?: return@readAction null
-                val hasBlock = PsiTreeUtil.findChildOfType(element,YAMLBlockMappingImpl::class.java) != null
-                if (hasBlock) return@readAction null
-                
-                val version = element.valueText.trim()
-                if (version.isBlank()) return@readAction null
-                val name = element.keyText.trim()
-                val point = SmartPointerManager.getInstance(element.project).createSmartPsiElementPointer(element)
-                val plainText = SmartPointerManager.getInstance(element.project).createSmartPsiElementPointer(pt)
-                DartYamlModel(
-                    name, version, tryParseDartVersionType(version), point, plainText,
-                )
+                try {
+                    // 2. 检查 element 是否还在
+                    val element = elementPointer.element ?: return@readAction null
+                    if (!element.isValid || project.isDisposed) return@readAction null
+
+                    // 3. 这里的 pt 指针还是需要的，因为它是 element 的子元素
+                    val pt = PsiTreeUtil.findChildOfType(element, YAMLPlainTextImpl::class.java) ?: return@readAction null
+
+                    // 检查是否有 block (比如有些 pubspec 是 key: { version: 1.0.0 } 这种结构)
+                    val hasBlock = PsiTreeUtil.findChildOfType(element, YAMLBlockMappingImpl::class.java) != null
+                    if (hasBlock) return@readAction null
+
+                    val version = element.valueText.trim()
+                    if (version.isBlank()) return@readAction null
+                    val name = element.keyText.trim()
+
+                    // 创建 pt 的指针
+                    val pointerManager = SmartPointerManager.getInstance(project)
+                    val plainTextPointer = pointerManager.createSmartPsiElementPointer(pt)
+
+                    // 直接复用传入的 elementPointer，不需要再 create 一次
+                    DartYamlModel(name, version, tryParseDartVersionType(version), elementPointer, plainTextPointer)
+                } catch (_: PsiInvalidElementAccessException) {
+                    null
+                }
             }
         }
 
         /**
          * 解析model的时候同时请求pub.dev的包数据
          * 多了一个请求
          */
-        suspend fun fetch(element: YAMLKeyValueImpl): DartYamlModel? {
+        suspend fun fetch(element: SmartPsiElementPointer<YAMLKeyValueImpl>): DartYamlModel? {
             val model = create(element) ?: return null
-            val fileAndProject = readAction {
-                if (!element.isValid) return@readAction null
-                element.containingFile to element.project
+            val (file, project) = readAction {
+                val psi = model.element.element ?: return@readAction null
+                psi.containingFile to psi.project
             } ?: return null
-            val (file, project) = fileAndProject
             val isIgnored = YamlFileIgDartPackageCache.getInstance(project).state.hasItem(file, model.name)
             if (isIgnored) return null
             val data = PubService.callPluginDetails(model.name) ?: return null

.idea/workspace.xml

@@ -1,14 +1,15 @@
 package shop.itbug.flutterx.common.yaml
 
+import com.intellij.openapi.application.readAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
 import com.intellij.psi.PsiManager
+import com.intellij.psi.SmartPointerManager
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import org.jetbrains.yaml.psi.YAMLFile
 import org.jetbrains.yaml.psi.impl.YAMLKeyValueImpl
-import shop.itbug.flutterx.services.MyPackageGroup
 
 // 判断项目是否为 flutter 项目
 suspend fun Project.isFlutterProject(): Boolean {
@@ -44,26 +45,36 @@ class PubspecYamlFileTools private constructor(yaml: YAMLFile) : YamlFileToolBas
     suspend fun getDependencyOverrides() = getChsWith("dependency_overrides")
 
 
+    private val YAMLKeyValueImpl.point
+        get() = SmartPointerManager.getInstance(project).createSmartPsiElementPointer(this)
+
     /**
      * 获取全部的插件模型
      */
-    suspend fun allDependencies() =
-        (getDependencies().map {
-            DartYamlModel.create(it)?.copy(
-                type = MyPackageGroup.Dependencies
-            )
-        } + getDevDependencies().map {
-            DartYamlModel.create(it)?.copy(type = MyPackageGroup.DevDependencies)
-        } + getDependencyOverrides().map {
-            DartYamlModel.create(it)?.copy(type = MyPackageGroup.DependencyOverrides)
-        }).filterNotNull()
+    suspend fun allDependencies(): List<DartYamlModel> = coroutineScope {
+        val deps = getDependencies()
+        val devDeps = getDevDependencies()
+        val overrideDeps = getDependencyOverrides()
+
+        val pointers = readAction {
+            (deps + devDeps + overrideDeps)
+                .filter { it.isValid }
+                .map { SmartPointerManager.createPointer(it) }
+        }
+
+        pointers.map { ptr ->
+            async { DartYamlModel.create(ptr) }
+        }.awaitAll().filterNotNull()
+    }
 
-    /**
-     * 获取插件列表模型
-     */
     suspend fun getDependenciesModel(list: List<YAMLKeyValueImpl>): List<DartYamlModel> {
+        val pointers = readAction {
+            list.filter { it.isValid }.map { SmartPointerManager.createPointer(it) }
+        }
         return coroutineScope {
-            list.map { async { DartYamlModel.fetch(it) } }.awaitAll().filterNotNull()
+            pointers.map { ptr ->
+                async { DartYamlModel.fetch(ptr) }
+            }.awaitAll().filterNotNull()
         }
     }