合并拉取请求 #44

4.4.0

Author: mdddj

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [4.4.0] - 2024-05-25
+
+- Fix the problem of stuck idea or Android studio
+- 修复as或者idea卡死的问题
+
 ## [4.3.1] - 2024-05-24
 
 - Optimize dart package version replacement logic

build.gradle.kts

@@ -1,4 +1,6 @@
 import org.jetbrains.changelog.Changelog
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 val dartVersion: String by project
 val sinceBuildVersion: String by project
@@ -9,15 +11,14 @@ val pluginVersion: String by project
 val type: String by project
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.9.20"
+    id("org.jetbrains.kotlin.jvm") version "2.0.0"
     id("org.jetbrains.intellij") version "1.16.1"
     idea
     id("org.jetbrains.changelog") version "2.2.0"
 }
 group = "shop.itbug"
 version = pluginVersion + type
 
-println(project.version)
 repositories {
     mavenLocal()
     mavenCentral()
@@ -60,8 +61,6 @@ dependencies {
 }
 
 val pushToken: String? = System.getenv("idea_push_token")
-var javaVersion = "17"
-
 
 tasks {
 
@@ -75,11 +74,10 @@ tasks {
         )
     }
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions.jvmTarget = javaVersion
-        kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-        compilerOptions.languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9)
         compilerOptions {
-
+            languageVersion.set(KotlinVersion.KOTLIN_2_0)
+            jvmTarget.set(JvmTarget.JVM_17)
+            freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
         }
     }
 
@@ -113,23 +111,19 @@ tasks {
     }
 
     compileKotlin {
-        kotlinOptions.jvmTarget = javaVersion
-    }
-
-    compileTestKotlin {
-        kotlinOptions.jvmTarget = javaVersion
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
     }
 
     test {
         useJUnitPlatform()
     }
 
     configurations.all {
-
     }
 
     verifyPlugin {
-
     }
 
     verifyPluginConfiguration {

gradle.properties

@@ -2,7 +2,7 @@ kotlin.stdlib.default.dependency=true
 kotlin.incremental.useClasspathSnapshot=false
 #kotlin.experimental.tryK2=true
 kapt.use.k2=true
-pluginVersion=4.3.1.
+pluginVersion=4.4.0.
 #===============================> 231
 #dartVersion=231.9411
 #sinceBuildVersion=231
@@ -11,7 +11,7 @@ pluginVersion=4.3.1.
 #ideaType=
 #type=231
 #===============================> 232
-#dartVersion=232.10305
+#dartVersion=232.10313
 #sinceBuildVersion=232
 #untilBuildVersion=232.*
 #ideaVersion=2023.2.3

src/main/kotlin/shop/itbug/fluttercheckversionx/hive/component/HiveValueComponent.kt

@@ -20,7 +20,7 @@ class HiveValueComponent(project: Project) : BorderLayoutPanel(), DioApiService.
 
 
     ///更新值
-    private fun changeJsonValue(value: Any) {
+    private fun changeJsonValue(value: Any?) {
         jsonEditor.changeValue(value)
     }
 

src/main/kotlin/shop/itbug/fluttercheckversionx/linemark/PluginDartIconLineMark.kt

@@ -11,8 +11,6 @@ import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
 import com.intellij.psi.PsiElement
 import com.intellij.ui.awt.RelativePoint
-import kotlinx.coroutines.runBlocking
-import org.jetbrains.yaml.psi.impl.YAMLKeyValueImpl
 import shop.itbug.fluttercheckversionx.actions.PUB_URL
 import shop.itbug.fluttercheckversionx.cache.DartPluginIgnoreConfig
 import shop.itbug.fluttercheckversionx.i18n.PluginBundle
@@ -27,8 +25,7 @@ import javax.swing.Icon
 class PluginDartIconLineMark : LineMarkerProvider {
 
     override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<PsiElement>? {
-        val isDartPlugin = runBlocking { element.isDartPluginElement() }
-        if (isDartPlugin && element is YAMLKeyValueImpl) {
+        if (element.isDartPluginElement()) {
             return LineMarkerInfo(
                 element.firstChild,
                 element.firstChild.textRange,

src/main/kotlin/shop/itbug/fluttercheckversionx/setting/GeneraAssetsSettingPanel.kt

@@ -7,13 +7,13 @@ import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.JBColor
+import com.intellij.ui.awt.RelativePoint
 import com.intellij.ui.components.JBList
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.Alarm
 import com.intellij.util.ui.components.BorderLayoutPanel
-import com.intellij.vcsUtil.showAbove
 import shop.itbug.fluttercheckversionx.config.GenerateAssetsClassConfig
 import shop.itbug.fluttercheckversionx.config.GenerateAssetsClassConfigModel
 import shop.itbug.fluttercheckversionx.i18n.PluginBundle
@@ -68,7 +68,7 @@ class GeneraAssetsSettingPanel(
         object : DumbAwareAction(AllIcons.General.Add) {
             override fun actionPerformed(e: AnActionEvent) {
                 WidgetUtil.getTextEditorPopup(PluginBundle.get("g.13"), "", {
-                    it.showAbove(igFilesWidget)
+                    it.show(RelativePoint.fromScreen(igFilesWidget.locationOnScreen))
                 }) {
                     this@GeneraAssetsSettingPanel.igFilesWidget.addItemString(it)
                 }

src/main/kotlin/shop/itbug/fluttercheckversionx/tools/DartPluginVersionCheck.kt

@@ -15,7 +15,10 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiRecursiveElementWalkingVisitor
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.runBlocking
 import shop.itbug.fluttercheckversionx.cache.DartPluginIgnoreConfig
 import shop.itbug.fluttercheckversionx.i18n.PluginBundle
 import shop.itbug.fluttercheckversionx.listeners.MyLoggerEvent
@@ -62,7 +65,6 @@ class DartPluginVersionCheck : ExternalAnnotator<DartPluginVersionCheck.Input, L
     }
 
     //执行长时间操作
-    @OptIn(ExperimentalCoroutinesApi::class)
     override fun doAnnotate(collectedInfo: Input?): List<Problem> {
         val arr = mutableListOf<Problem>()
         collectedInfo?.let {
@@ -72,7 +74,7 @@ class DartPluginVersionCheck : ExternalAnnotator<DartPluginVersionCheck.Input, L
                     key = LogKeys.checkPlugin
                 )
             )
-            val infos: List<PubVersionDataModel?> = runBlocking(Dispatchers.IO.limitedParallelism(100)) {
+            val infos: List<PubVersionDataModel?> = runBlocking {
                 val tasks = it.element.map { info ->
                     val pluginName = info.packageInfo.name
                     val r: Deferred<PubVersionDataModel?> = async {

src/main/kotlin/shop/itbug/fluttercheckversionx/util/MyPsiUtil.kt

@@ -192,20 +192,11 @@ fun PsiElement.exByModifyPsiElementText(newText: String) {
 /**
  * 判断此节点是否为flutter插件
  */
-suspend fun PsiElement.isDartPluginElement(): Boolean {
-
-    if (this is YAMLKeyValueImpl) {
-        val allPluginsMap = MyPsiElementUtil.getAllFlutters(project)
-        val allPlugins = allPluginsMap.values.toList()
-        var isin = false
-        allPlugins.forEach { e1 ->
-            try {
-                e1.first { it.name == this.keyText }
-                isin = true
-            } catch (_: Exception) {
-            }
-        }
-        return isin
+fun PsiElement.isDartPluginElement(): Boolean {
+    if (this is YAMLKeyValueImpl && this.parent.parent is YAMLKeyValueImpl) {
+        val p = this.parent.parent as YAMLKeyValueImpl
+        val temp = p.keyText
+        return temp == "dependencies" || temp == "dependency_overrides" || temp == "dev_dependencies"
     }
     return false
 }