功能新增

Author: mdddj

.idea/workspace.xml

@@ -46,13 +46,13 @@ val bPlugins = mutableListOf(
     "org.intellij.groovy"
 )
 
+println(ideType)
 if (ideType.toInt() >= 243) {
     bPlugins.add("com.intellij.modules.json")
     bPlugins.add("com.intellij.platform.images")
-    if(ideType != "253"){
+    if(ideType.toInt() < 253) {
         bPlugins.add("org.intellij.intelliLang")
     }
-
 }
 
 dependencies {
@@ -82,14 +82,15 @@ dependencies {
         zipSigner()
         javaCompiler()
 
-        if(ideType == "253"){
-            bundledModule("org.intellij.intelliLang")
-        }
 
-        bundledModule("intellij.libraries.ktor.client")
-        bundledModule("intellij.libraries.ktor.client.cio")
 
-        testBundledModules("intellij.libraries.ktor.client", "intellij.libraries.ktor.client.cio")
+        if(ideType.toInt() < 253){
+            bundledModule("intellij.libraries.ktor.client")
+            bundledModule("intellij.libraries.ktor.client.cio")
+            testBundledModules("intellij.libraries.ktor.client", "intellij.libraries.ktor.client.cio")
+            testPlugins("Dart:$dartVersion")
+        }
+
 
         testFramework(TestFrameworkType.Platform)
 
@@ -151,7 +152,7 @@ tasks {
 
     patchPluginXml {
         sinceBuild.set(sinceBuildVersion)
-        untilBuild.set(untilBuildVersion)
+//        untilBuild.set(untilBuildVersion)
         changeNotes.set(myChangeLog)
         pluginDescription.set(file("插件介绍h.md").readText().trim())
     }

build.gradle.kts

@@ -12,7 +12,7 @@ ideType=252
 #ideType=251
 #====================
 #253
-#dartVersion=253.17525.83
+#dartVersion=253.28086.9
 #sinceBuildVersion=253
 #untilBuildVersion=253.*
 #ideType=253

gradle.properties

@@ -1,12 +1,23 @@
 package shop.itbug.fluttercheckversionx.common.yaml
 
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
+import com.intellij.psi.PsiManager
 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.fluttercheckversionx.services.MyPackageGroup
 
+// 判断项目是否为 flutter 项目
+suspend fun Project.isFlutterProject(): Boolean {
+    val baseDir = guessProjectDir() ?: return false
+    val pubFile = baseDir.findChild("pubspec.yaml") ?: return false
+    val pubPsiFile = PsiManager.getInstance(this).findFile(pubFile) as? YAMLFile? ?: return false
+    return PubspecYamlFileTools.create(pubPsiFile).isFlutterProject()
+}
+
 /**
  * flutter yaml 操作相关工具函数
  */

src/main/kotlin/shop/itbug/fluttercheckversionx/common/yaml/YamlFileTools.kt

@@ -51,6 +51,7 @@ class DartDocumentExt : AbstractDocumentationProvider(), ExternalDocumentationHa
         )
         if (result.isEmpty()) return "Document not found"
         val docInfo = result.first()
+        println("kind类型:${docInfo.elementKind}")
         val dartFormalParameterList =
             reference?.parent?.children?.filterIsInstance<DartFormalParameterListImpl>() ?: emptyList()
         return renderView(

src/main/kotlin/shop/itbug/fluttercheckversionx/document/DartDocumentExt.kt

@@ -134,7 +134,7 @@ fun MarkdownNode.toHtml(project: Project): String {
             nodeText = nodeText.replace("{@end-tool}", "</pre>")
         }
 
-        println("\nnode text: $nodeText   ✅NodeType=$nodeType \n")
+//        println("\nnode text: $nodeText   ✅NodeType=$nodeType \n")
 
         when (nodeType) {
             MarkdownElementTypes.UNORDERED_LIST -> wrapChildren("ul", newline = true)

src/main/kotlin/shop/itbug/fluttercheckversionx/document/MarkdownRender.kt

@@ -7,7 +7,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.components.Service
-import com.intellij.openapi.diagnostic.thisLogger
+import com.intellij.openapi.components.service
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
@@ -30,7 +30,6 @@ import shop.itbug.fluttercheckversionx.config.GenerateAssetsClassConfig
 import shop.itbug.fluttercheckversionx.config.PluginConfig
 import shop.itbug.fluttercheckversionx.i18n.PluginBundle
 import shop.itbug.fluttercheckversionx.icons.MyIcons
-import shop.itbug.fluttercheckversionx.model.FlutterLocalVersion
 import shop.itbug.fluttercheckversionx.model.getVersionText
 import shop.itbug.fluttercheckversionx.tools.FlutterVersionTool
 import shop.itbug.fluttercheckversionx.util.DateUtils
@@ -40,7 +39,6 @@ import shop.itbug.fluttercheckversionx.util.Util
 
 //
 class MyAssetGenPostStart : ProjectActivity {
-    val logger = thisLogger()
     override suspend fun execute(project: Project) {
         AssetsListeningProjectService.getInstance(project).initListening()
         FlutterL10nService.getInstance(project).checkAllKeys()
@@ -49,10 +47,11 @@ class MyAssetGenPostStart : ProjectActivity {
             if (!project.isDisposed && setting.state.scanDartStringInStart) {
                 FlutterL10nService.getInstance(project).startScanStringElements()
             }
-        }
-
 
+        }
         FlutterXVMService.getInstance(project)
+        FlutterVersionService.getInstance(project).refreshAndGetFlutterVersion()
+        project.service<DotMigrateService>()
     }
 }
 
@@ -67,7 +66,6 @@ class MyProjectListening : ProjectManagerListener {
 
 @Service(Service.Level.PROJECT)
 class AssetsListeningProjectService(val project: Project) : Disposable {
-    private val logger = thisLogger()
     private val connect: MessageBusConnection = project.messageBus.connect(this)
     private var checkFlutterVersionTask: CheckFlutterVersionTask = CheckFlutterVersionTask()
 
@@ -134,32 +132,20 @@ class AssetsListeningProjectService(val project: Project) : Disposable {
     }
 
     ///检测flutter新版本弹出
-    private inner class CheckFlutterVersionTask() :
+    private inner class CheckFlutterVersionTask :
         Task.Backgroundable(project, "Detecting Flutter version...") {
         var indication: ProgressIndicator? = null
         override fun run(indicator: ProgressIndicator) {
             this.indication = indicator
-            val flutterChannel = Util.getFlutterChannel()
-            val currentFlutterVersion: FlutterLocalVersion? =
-                runBlocking { FlutterVersionTool.getLocalFlutterVersion(project) }
-            if (flutterChannel == null) {
-                return
-            }
-            currentFlutterVersion?.let { c ->
-                try {
-                    val version = FlutterService.getVersion()
-                    version.apply {
-                        val hash = version.getCurrentReleaseByChannel(flutterChannel)
-                        val release = releases.find { o -> o.hash == hash }
-                        release?.let { r ->
-                            if (r.version != c.getVersionText()) {
-                                showTip(r, project)
-                            }
-                        }
-                    }
-                } catch (e: Exception) {
-                    logger.warn("检查 flutter 版本失败:${e.localizedMessage}")
-                }
+            val flutterVersionService = FlutterVersionService.getInstance(project)
+            val flutterChannel = Util.getFlutterChannel() ?: return
+            val currentFlutterVersion =
+                runBlocking { flutterVersionService.refreshAndGetFlutterVersion() } ?: return
+            val version = flutterVersionService.getRemoteFlutterVersion() ?: return
+            val hash = version.getCurrentReleaseByChannel(flutterChannel)
+            val release = version.releases.find { o -> o.hash == hash } ?: return
+            if (release.version != currentFlutterVersion.getVersionText()) {
+                showTip(release, project)
             }
         }