XenoAmess · XenoAmess · Jan 9, 2024 · Jan 9, 2024 · Jan 17, 2024 · Jan 22, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,24 +24,24 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest , ubuntu-latest , macos-latest ]
-        java: [ 17 ]
+        java: [ 21 ]
         experimental: [ false ]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-gradle-m2-${{ hashFiles('**/build.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.gradle/caches/
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/build.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper/
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/build.gradle') }}

diff --git a/build.cmd b/build.cmd
@@ -1,11 +1,11 @@
-set JAVA_HOME=C:\jdk-17\
+set JAVA_HOME=C:\jdk-21\
 
 cd ./p3c-pmd
 call ./mvnw clean install -Dmaven.javadoc.skip=false -e -X
 cd ../
 cd ./idea-plugin
 
-set JAVA_HOME=C:\jdk-17\
+set JAVA_HOME=C:\jdk-21\
 
 cd ./p3c-common
 call ../gradlew clean publishToMavenLocal

diff --git a/deploy.cmd b/deploy.cmd
@@ -5,7 +5,7 @@ call ./mvnw clean deploy -Dmaven.javadoc.skip=false -e -X -Psonatype-oss-release
 cd ../
 cd ./idea-plugin
 
-set JAVA_HOME=C:\jdk-17\
+set JAVA_HOME=C:\jdk-21\
 
 cd ./p3c-common
 rem call ../gradlew clean install sign uploadArchives -DossrhUsername="%ossrhUsername%" -DossrhPassword="%ossrhPassword%"

diff --git a/idea-plugin/README.md b/idea-plugin/README.md
@@ -21,7 +21,7 @@ cd p3c-idea
 
 ## <font color="green">Use p3c-common as your plugin dependency</font>
 ```groovy
-compile 'com.xenoamess.p3c.idea:p3c-common:2.2.2.0x'
+compile 'com.xenoamess.p3c.idea:p3c-common:2.2.3.0x'
 ```
 ## [中文使用手册](README_cn.md)
 ## <font color="green">Install</font>

diff --git a/idea-plugin/build.gradle b/idea-plugin/build.gradle
@@ -15,7 +15,7 @@ static boolean shouldIncludeJava(String idea_version_string) {
 
 buildscript {
     project.ext {
-        kotlin_version = "1.9.22"
+        kotlin_version = "2.0.20"
     }
     repositories {
         mavenCentral()
@@ -39,10 +39,12 @@ allprojects {
     apply plugin: 'java'
     apply plugin: 'kotlin'
     apply plugin: 'maven-publish'
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     compileJava.options.encoding = 'UTF-8'
+    kotlin {
+        jvmToolchain(17)
+    }
     configurations.all {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }

diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
@@ -3,10 +3,10 @@
 # See https://www.jetbrains.com/intellij-repository/releases/
 # See https://www.jetbrains.com/intellij-repository/snapshots/
 #idea_version=2022.1
-idea_version=232.8660.185
+idea_version=2024.1
 #idea_version=181.5540.23
 #idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
 systemProp.file.encoding=UTF-8
-plugin_version=2.2.2.0x
+plugin_version=2.2.3.0x
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
diff --git a/idea-plugin/gradle/wrapper/gradle-wrapper.properties b/idea-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Sep 21 06:16:57 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "1.13.3"
+    id "org.jetbrains.intellij" version "1.17.4"
 
-    id "org.sonarqube" version "4.4.1.3373"
+    id "org.sonarqube" version "5.1.0.4882"
 
-    id "com.github.ben-manes.versions" version "0.50.0"
+    id "com.github.ben-manes.versions" version "0.51.0"
 }
 
 apply plugin: 'kotlin'
@@ -16,12 +16,14 @@ javadoc {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.convention('javadoc');
+    archiveClassifier.set('javadoc');
     from 'build/docs/javadoc'
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.convention('sources');
+    archiveClassifier.set('sources');
     from sourceSets.main.allSource
 }
 
@@ -57,7 +59,7 @@ version plugin_version
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 dependencies {
-    implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.32'
+    implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.33'
     implementation("com.xenoamess.p3c:p3c-pmd:$plugin_version") {
         exclude group: 'org.apache.logging.log4j'
         exclude group: 'org.slf4j'

diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/AliInspectionAction.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/AliInspectionAction.kt
@@ -30,26 +30,18 @@ import com.intellij.codeInspection.InspectionsBundle
 import com.intellij.codeInspection.ex.GlobalInspectionContextImpl
 import com.intellij.codeInspection.ex.InspectionManagerEx
 import com.intellij.codeInspection.ex.InspectionToolWrapper
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.module.Module
-import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.wm.ToolWindowId
-import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiFileSystemItem
 import com.intellij.psi.PsiManager
 import java.awt.event.KeyEvent
-import kotlin.reflect.full.companionObject
-import kotlin.reflect.full.companionObjectInstance
-import kotlin.reflect.full.functions
 
 /**
  * @author caikang
@@ -222,4 +214,9 @@ class AliInspectionAction : AnAction() {
             return PmdGlobalInspectionContextImpl(managerEx.project, managerEx.contentManager, projectScopeSelected)
         }
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
+
 }
diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/SwitchLanguageAction.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/SwitchLanguageAction.kt
@@ -20,6 +20,7 @@ import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.smartfox.idea.common.util.BalloonNotifications
 import com.alibaba.smartfox.idea.common.util.getService
 import com.intellij.notification.NotificationListener
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ex.ApplicationManagerEx
@@ -48,4 +49,9 @@ class SwitchLanguageAction : AnAction(), DumbAware {
     override fun update(e: AnActionEvent) {
         e.presentation.text = P3cBundle.getMessage("$textKey.cur_${p3cConfig.locale}")
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.EDT
+    }
+
 }
diff --git a/...n/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/ToggleProjectInspectionAction.kt b/...n/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/ToggleProjectInspectionAction.kt
@@ -20,6 +20,7 @@ import com.alibaba.p3c.idea.compatible.inspection.Inspections
 import com.alibaba.p3c.idea.config.SmartFoxProjectConfig
 import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.p3c.idea.inspection.AliBaseInspection
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.components.ServiceManager
@@ -56,4 +57,9 @@ class ToggleProjectInspectionAction : AnAction() {
             P3cBundle.getMessage("$textKey.close")
         }
     }
+
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
+
 }
diff --git a/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/i18n/P3cBundle.kt b/idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/i18n/P3cBundle.kt
@@ -19,9 +19,10 @@ import com.alibaba.p3c.idea.config.P3cConfig
 import com.xenoamess.p3c.pmd.I18nResources
 import com.alibaba.smartfox.idea.common.util.getService
 import com.intellij.AbstractBundle
-import com.intellij.CommonBundle
+import com.intellij.openapi.application.CachedSingletonsRegistry
 import java.util.Locale
 import java.util.ResourceBundle
+import java.util.function.Supplier
 
 /**
  *
@@ -30,15 +31,23 @@ import java.util.ResourceBundle
  * @date 2017/06/20
  */
 object P3cBundle {
-    private val p3cConfig = P3cConfig::class.java.getService()
-    private val resourceBundle = ResourceBundle.getBundle("messages.P3cBundle",
-            Locale(p3cConfig.locale), I18nResources.XmlControl())
+    private val p3cConfigSupplier: Supplier<P3cConfig> =
+        CachedSingletonsRegistry.lazy {
+            P3cConfig::class.java.getService()
+        }
+    private val resourceBundleSupplier =
+        CachedSingletonsRegistry.lazy {
+            ResourceBundle.getBundle(
+                "messages.P3cBundle",
+                Locale(p3cConfigSupplier.get().locale), I18nResources.XmlControl()
+            )
+        }
 
     fun getMessage(key: String): String {
-        return resourceBundle.getString(key).trim()
+        return resourceBundleSupplier.get().getString(key).trim()
     }
 
     fun message(key: String, vararg params: Any): String {
-        return AbstractBundle.message(resourceBundle, key, *params).trim()
+        return AbstractBundle.message(resourceBundleSupplier.get(), key, *params).trim()
     }
 }
diff --git a/...kotlin/com/alibaba/p3c/idea/inspection/standalone/AliAccessStaticViaInstanceInspection.kt b/...kotlin/com/alibaba/p3c/idea/inspection/standalone/AliAccessStaticViaInstanceInspection.kt
@@ -26,19 +26,10 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil
 import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil
 import com.intellij.codeInsight.daemon.impl.quickfix.AccessStaticViaInstanceFix
 import com.intellij.codeInsight.daemon.impl.quickfix.RemoveUnusedVariableUtil
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance
-import com.intellij.psi.JavaElementVisitor
-import com.intellij.psi.JavaResolveResult
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiElementVisitor
-import com.intellij.psi.PsiMember
-import com.intellij.psi.PsiModifier
-import com.intellij.psi.PsiPackage
-import com.intellij.psi.PsiReferenceExpression
-import com.intellij.psi.PsiSubstitutor
-import java.util.ArrayList
+import com.intellij.psi.*
 
 /**
  * @author caikang
@@ -72,16 +63,10 @@ class AliAccessStaticViaInstanceInspection : AccessStaticViaInstance, AliBaseIns
 
     override fun createAccessStaticViaInstanceFix(
             expr: PsiReferenceExpression,
-            onTheFly: Boolean,
             result: JavaResolveResult
-    ): AccessStaticViaInstanceFix {
-        return object : AccessStaticViaInstanceFix(expr, result, onTheFly) {
+    ): LocalQuickFix {
+        val accessStaticViaInstanceFix : AccessStaticViaInstanceFix = object : AccessStaticViaInstanceFix(expr, result) {
             val fixKey = "com.alibaba.p3c.idea.quickfix.standalone.AliAccessStaticViaInstanceInspection"
-            internal val text = calcText(result.element as PsiMember, result.substitutor)
-
-            override fun getText(): String {
-                return text
-            }
 
             private fun calcText(member: PsiMember, substitutor: PsiSubstitutor): String {
                 val aClass = member.containingClass ?: return ""
@@ -96,6 +81,7 @@ class AliAccessStaticViaInstanceInspection : AccessStaticViaInstance, AliBaseIns
                 }
             }
         }
+        return LocalQuickFix.from(accessStaticViaInstanceFix) as LocalQuickFix
     }
 
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
@@ -145,7 +131,7 @@ class AliAccessStaticViaInstanceInspection : AccessStaticViaInstance, AliBaseIns
                 return
             }
         }
-        holder.registerProblem(expr, description, createAccessStaticViaInstanceFix(expr, onTheFly, result))
+        holder.registerProblem(expr, description, createAccessStaticViaInstanceFix(expr, result))
     }
 
 }
diff --git a/...ugin/p3c-common/src/main/kotlin/com/alibaba/smartfox/idea/common/util/CommonExtensions.kt b/...ugin/p3c-common/src/main/kotlin/com/alibaba/smartfox/idea/common/util/CommonExtensions.kt
@@ -15,7 +15,7 @@
  */
 package com.alibaba.smartfox.idea.common.util
 
-import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 
 /**
@@ -25,9 +25,9 @@ import com.intellij.openapi.project.Project
  * @date 2017/06/19
  */
 fun <T> Class<T>.getService(): T {
-    return ServiceManager.getService(this)
+    return ApplicationManager.getApplication().getService(this)
 }
 
 fun <T> Class<T>.getService(project: Project): T {
-    return ServiceManager.getService(project, this)
+    return project.getService(this)
 }
diff --git a/idea-plugin/p3c-idea/build.gradle b/idea-plugin/p3c-idea/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "1.13.3"
+    id "org.jetbrains.intellij" version "1.17.4"
 
-    id "com.github.ben-manes.versions" version "0.50.0"
+    id "com.github.ben-manes.versions" version "0.51.0"
 }
 apply plugin: 'kotlin'
 apply plugin: 'idea'

diff --git a/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml b/idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml
@@ -29,6 +29,11 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <ul>2.2.3.0x
+            <li>Fix 2024.1 compatibility issue</li>
+            <li>Fix 2024.2 compatibility issue</li>
+            <li>upgrade gradle & building jdk & intellij plugin version</li>
+        </ul>
         <ul>2.2.2.0x
             <li>Fix 2023.2 compatibility issue</li>
         </ul>
@@ -233,7 +238,7 @@
     ]]>
     </change-notes>
 
-    <idea-version since-build="232.8660.185"/>
+    <idea-version since-build="241.14494.240"/>
 
     <depends optional="true" config-file="pluginWithJava.xml">com.intellij.modules.java</depends>
     <depends>com.intellij.modules.platform</depends>

diff --git a/idea-plugin/settings.gradle b/idea-plugin/settings.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.develocity" version "3.18.1"
 }
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
 include 'p3c-idea'

diff --git a/p3c-pmd/README.md b/p3c-pmd/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.2.2.0x</version>
+    <version>2.2.3.0x</version>
 </dependency>
 ```
 ### <font color="green">Gradle</font>