优化线程模型

Author: YangLang

.gitignore

@@ -11,3 +11,4 @@ doc/node_modules/
 doc/nohup.out
 doc/README.md
 local.properties
+.intellijPlatform

CHANGELOG.md

@@ -2,60 +2,62 @@
 
 ## [未完待续]
 
-###
+## 4.1.7 - 2024-08-24
 
-## [4.1.6] - 2024-08-17
+- `Base`: 优化线程模型
+
+## 4.1.6 - 2024-08-17
 
 - `Base`: 修复 `modify PSI for non-committed Document`
 
-## [4.1.5] - 2024-08-10
+## 4.1.5 - 2024-08-10
 
 - `Flutter Resource`: 优化资源列表预览尺寸
 
-## [4.1.4] - 2024-08-03
+## 4.1.4 - 2024-08-03
 
 - `Base`: 调整R文件创建逻辑
 - `Base`: 优化 `fromJson`、`toJson`
 
-## [4.1.3] - 2024-06-30
+## 4.1.3 - 2024-06-30
 
 - `Base`: 优化资源检测逻辑
 
-## [4.1.2] - 2024-06-24
+## 4.1.2 - 2024-06-24
 
 - `Base`: UI 优化
 - `Flutter Resource`: 交互细调整
 
-## [4.1.1] - 2024-06-17
+## 4.1.1 - 2024-06-17
 
 - `Base`: 调整部分UI布局
 - `Base`: 优化R资源生成机制
 - `Base`: 修复windows平台乱码问题
 
-## [4.0.4] - 2024-05-03
+## 4.0.4 - 2024-05-03
 
 - `Code`: 兼容223以后版本(ActionUpdateThread)
 
-## [4.0.3] - 2024-04-15
+## 4.0.3 - 2024-04-15
 
 - `Code`: 生成的R资源类构造函数私有化
 - `Dart Code`: 优化`LiveTemplate`配置
 
-## [4.0.2] - 2024-04-2
+## 4.0.2 - 2024-04-2
 
 - `Flutter Resource`: 优化图片压缩引导弹窗逻辑
 - `Repo Mirror`: 调整镜像配置UI && 拆分镜像注册方式(项目注入、插件注入、Flutter Gradle脚本注入)
 
-## [4.0.1] - 2024-03-12
+## 4.0.1 - 2024-03-12
 
 - `Base`: Bug修复 & 更新文档地址
 
-## [4.0.0] - 2024-01-16
+## 4.0.0 - 2024-01-16
 
 - `Flutter Resource`: 添加资源图片时，新增压缩引导弹窗
 - `Code`: 修复以目录的方式注册资源，R文件不更新Bug
 - `Base`: 解决切换分支时，图片大小检测弹窗频繁弹出Bug
 
-## [3.0.6] - 2024-01-13
+## 3.0.6 - 2024-01-13
 
-- `Base`: 代码优化
+- `Base`: 代码优化

build.gradle.kts

@@ -1,28 +1,18 @@
+import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.date
 import org.jetbrains.changelog.markdownToHTML
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
-    // Java support
     id("java")
-    // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.5.30"
-    // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.11.0"
-    // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "1.3.0"
-    // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "0.1.12"
+    id("org.jetbrains.changelog") version "2.2.1"
+    id("org.jetbrains.intellij.platform") version "2.0.1"
 }
 
-group = properties("pluginGroup")
-version = properties("pluginVersion")
-
-// Configure project's dependencies
 repositories {
     mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 dependencies {
@@ -32,107 +22,92 @@ dependencies {
     implementation("com.twelvemonkeys.imageio:imageio-webp:3.10.1")
     implementation("com.twelvemonkeys.imageio:imageio-batik:3.10.1")
     implementation("com.tinify:tinify:1.8.3")
-}
 
-// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-intellij {
-    pluginName.set(properties("pluginName"))
-    version.set(properties("platformVersion"))
-    type.set(properties("platformType"))
-    downloadSources.set(properties("platformDownloadSources").toBoolean())
-    updateSinceUntilBuild.set(false)
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
+    intellijPlatform {
+        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
+        bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
+        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+
+        instrumentationTools()
+        pluginVerifier()
+        zipSigner()
+    }
 }
 
-// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
-    version.set(properties("pluginVersion"))
-    path.set("${project.projectDir}/CHANGELOG.md")
+    version.set(providers.gradleProperty("pluginVersion"))
+    path.set(file("CHANGELOG.md").canonicalPath)
     header.set(provider { "[${version.get()}] - ${date()}" })
+    headerParserRegex.set("""(\d+\.\d+\.\d+)""".toRegex())
     itemPrefix.set("-")
     keepUnreleasedSection.set(true)
     unreleasedTerm.set("[未完待续]")
     groups.set(listOf(""))
 }
 
-// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
-    cachePath.set(projectDir.resolve(".qodana").canonicalPath)
-    reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
-    saveReport.set(true)
-    showReport.set(System.getenv("QODANA_SHOW_REPORT").toBoolean())
-}
+intellijPlatform {
+    pluginConfiguration {
+        version = providers.gradleProperty("pluginVersion")
+        description = providers.fileContents(layout.projectDirectory.file("PLUGIN_DESC.md")).asText.map {
+            val start = "<!-- Plugin description -->"
+            val end = "<!-- Plugin description end -->"
 
-tasks {
-    // Set the JVM compatibility versions
-    properties("javaVersion").let {
-        withType<JavaCompile> {
-            sourceCompatibility = it
-            targetCompatibility = it
+            with(it.lines()) {
+                if (!containsAll(listOf(start, end))) {
+                    throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
+                }
+                subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
+            }
+        }
+        ideaVersion {
+            sinceBuild = providers.gradleProperty("pluginSinceBuild")
+            untilBuild = provider { null }
         }
-        withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = it
+        val changelog = project.changelog
+        changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
+            with(changelog) {
+                renderItem(
+                        (getOrNull(pluginVersion) ?: getUnreleased())
+                                .withHeader(false)
+                                .withEmptySections(false),
+                        Changelog.OutputType.HTML,
+                )
+            }
         }
     }
-
-    wrapper {
-        gradleVersion = properties("gradleVersion")
+    signing {
+        certificateChainFile.set(project.file("profiles/chain.crt"))
+        privateKeyFile.set(project.file("profiles/private.pem"))
+        password.set(providers.environmentVariable("PRIVATE_KEY_PASSWORD"))
     }
-
-    patchPluginXml {
-        version.set(properties("pluginVersion"))
-        // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription.set(
-            projectDir.resolve("PLUGIN_DESC.md").readText().lines().run {
-                val start = "<!-- Plugin description -->"
-                val end = "<!-- Plugin description end -->"
-
-                if (!containsAll(listOf(start, end))) {
-                    throw GradleException("Plugin description section not found in PLUGIN_DESC.md:\n$start ... $end")
-                }
-                subList(indexOf(start) + 1, indexOf(end))
-            }.joinToString("\n").run { markdownToHTML(this) }
-        )
-
-        // Get the latest available change notes from the changelog file
-        changeNotes.set(provider {
-            changelog.run {
-                getOrNull(properties("pluginVersion")) ?: getLatest()
-            }.toHTML()
-        })
+    publishing {
+        token = providers.environmentVariable("PUBLISH_TOKEN")
+        channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
     }
-
-    runPluginVerifier {
-        ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty))
+    pluginVerification {
+        ides {
+            recommended()
+        }
     }
+}
 
-    // Configure UI tests plugin
-    // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-    runIdeForUiTests {
-        systemProperty("robot-server.port", "8082")
-        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-        systemProperty("jb.consents.confirmation.enabled", "false")
+intellijPlatformTesting {
+    runIde {
+        register("runOnAndroidStudio") {
+            localPath = file(providers.gradleProperty("idePath"))
+            prepareSandboxTask {
+                sandboxDirectory = project.layout.buildDirectory.dir("sandbox-as")
+            }
+        }
     }
+}
 
-    signPlugin {
-        certificateChainFile.set(project.file("profiles/chain.crt"))
-        privateKeyFile.set(project.file("profiles/private.pem"))
-        password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
+tasks {
+    wrapper {
+        gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
 
     publishPlugin {
-//        dependsOn("patchChangelog")
-        token.set(System.getenv("PUBLISH_TOKEN"))
-        // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
-        // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
-        // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first()))
-    }
-
-    runIde {
-//        jbrVersion.set("11_0_10b1145.115")
-        ideDir.set(file(properties("idePath")))
+        dependsOn(patchChangelog)
     }
 }

gradle.properties

@@ -1,23 +1,11 @@
-# IntelliJ Platform Artifacts Repositories
-# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
-pluginGroup=com.xtu.plugin
 pluginName=iFlutter
-pluginVersion=4.1.6
-# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
-# See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2022.3.1
+pluginVersion=4.1.7
+gradleVersion=17
+pluginSinceBuild=223
 platformType=IC
 platformVersion=2024.1.1
-#idePath=/Applications/Android Studio.app/Contents
-idePath=C:\\Program Files\\Android\\Android Studio
-platformDownloadSources=true
-# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins=java,org.intellij.groovy,org.jetbrains.plugins.yaml:241.14494.150,Dart:241.18808,io.flutter:81.0.2
-# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion=17
-gradleVersion=7.3
-# Opt-out flag for bundling Kotlin standard library.
-# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
-# suppress inspection "UnusedProperty"
-kotlin.stdlib.default.dependency=false
+idePath=/Applications/Android Studio.app/Contents
+#idePath=C:\\Program Files\\Android\\Android Studio
+platformBundledPlugins=com.intellij.java,org.intellij.groovy,org.jetbrains.plugins.yaml
+platformPlugins=Dart:241.18808,io.flutter:81.0.2
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.3-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

qodana.yml

@@ -10,7 +10,8 @@
 public class IFlutterActionGroup extends DefaultActionGroup {
 
     @Override
-    public @NotNull ActionUpdateThread getActionUpdateThread() {
+    @NotNull
+    public ActionUpdateThread getActionUpdateThread() {
         return ActionUpdateThread.BGT;
     }
 

src/main/java/com/xtu/plugin/flutter/action/IFlutterActionGroup.java

@@ -52,7 +52,8 @@ protected String getDimensionServiceKey() {
     }
 
     @Override
-    protected Action @NotNull [] createActions() {
+    @NotNull
+    protected Action[] createActions() {
         return new Action[]{copyAction, getOKAction()};
     }
 

src/main/java/com/xtu/plugin/flutter/action/analysis/ui/DuplicateResDisplayDialog.java

@@ -34,7 +34,8 @@ String getDimensionServiceKey() {
     }
 
     @Override
-    protected Action @NotNull [] createActions() {
+    @NotNull
+    protected Action[] createActions() {
         return new Action[]{copyAction, getOKAction()};
     }
 

src/main/java/com/xtu/plugin/flutter/action/analysis/ui/UselessResAnalysisDialog.java

@@ -37,8 +37,6 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 newAssetList.add(assetPath);
             }
         }
-        DartRFileGenerator.getInstance().resetCache();
-        DartFontFileGenerator.getInstance().resetCache();
         WriteCommandAction.runWriteCommandAction(project, () -> {
             PubSpecUtils.writeAssetList(project, newAssetList, newFontList);
         });

src/main/java/com/xtu/plugin/flutter/action/generate/res/GenerateResAction.java

@@ -124,7 +124,8 @@ public JComponent getPreferredFocusedComponent() {
     }
 
     @Override
-    protected Action @NotNull [] createActions() {
+    @NotNull
+    protected Action[] createActions() {
         return new Action[]{getOKAction()};
     }