Xenoamess maintain fork develop

.github/workflows/auto-merge.yml

@@ -7,7 +7,7 @@ jobs:
   auto-merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
           target: minor

.github/workflows/build.yml

@@ -24,11 +24,11 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest , ubuntu-latest , macos-latest ]
-        java: [ 11, 14 ]
+        java: [ 17 ]
         experimental: [ false ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
           path: ~/.m2
@@ -48,7 +48,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: adopt

build.cmd

@@ -1,4 +1,4 @@
-set JAVA_HOME=C:\jdk-11.0.13+8\
+set JAVA_HOME=C:\jdk-17\
 cd ./p3c-pmd
 call ./mvnw clean install -Dmaven.javadoc.skip=false -e -X
 cd ../

deploy.cmd

@@ -1,4 +1,4 @@
-set JAVA_HOME=C:\jdk-11.0.13+8\
+set JAVA_HOME=C:\jdk-17\
 cd ./p3c-pmd
 call ./mvnw clean deploy -Dmaven.javadoc.skip=false -e -X -Psonatype-oss-release
 cd ../

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.1.1.5x'
+compile 'com.xenoamess.p3c.idea:p3c-common:2.2.0.0x'
 ```
 ## [中文使用手册](README_cn.md)
 ## <font color="green">Install</font>

idea-plugin/build.gradle

@@ -15,7 +15,7 @@ static boolean shouldIncludeJava(String idea_version_string) {
 
 buildscript {
     project.ext {
-        kotlin_version = "1.8.10"
+        kotlin_version = "1.9.22"
     }
     repositories {
         mavenCentral()

idea-plugin/gradle.properties

@@ -2,10 +2,10 @@
 # See https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 # See https://www.jetbrains.com/intellij-repository/releases/
 # See https://www.jetbrains.com/intellij-repository/snapshots/
-idea_version=2022.1
-#idea_version=211-EAP-SNAPSHOT
+#idea_version=2022.1
+idea_version=231.8109.175
 #idea_version=181.5540.23
 #idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
 systemProp.file.encoding=UTF-8
-plugin_version=2.1.1.5x
+plugin_version=2.2.0.0x

idea-plugin/p3c-common/build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "1.9.0"
+    id "org.jetbrains.intellij" version "1.13.3"
 
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.4.1.3373"
 
-    id "com.github.ben-manes.versions" version "0.46.0"
+    id "com.github.ben-manes.versions" version "0.50.0"
 }
 
 apply plugin: 'kotlin'
@@ -62,7 +62,7 @@ dependencies {
         exclude group: 'org.apache.logging.log4j'
         exclude group: 'org.slf4j'
     }
-    implementation group: 'org.javassist', name: 'javassist', version: '3.29.2-GA'
+    implementation group: 'org.javassist', name: 'javassist', version: '3.30.2-GA'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$project.kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$project.kotlin_version"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'

idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/action/PmdGlobalInspectionContextImpl.kt

@@ -227,43 +227,50 @@ class PmdGlobalInspectionContextImpl(
     ): Future<*>? {
         val task: Backgroundable = object : Backgroundable(project, "Scanning Files to Inspect") {
             override fun run(indicator: ProgressIndicator) {
-                try {
-                    val fileIndex: FileIndex = ProjectRootManager.getInstance(project).fileIndex
-                    scope.accept { file: VirtualFile? ->
-                        ProgressManager.checkCanceled()
-                        if (isProjectOrWorkspaceFile(file!!) || !fileIndex.isInContent(file)) return@accept true
-                        val psiFile =
-                            ReadAction.compute<PsiFile?, RuntimeException> {
-                                if (project.isDisposed) throw ProcessCanceledException()
-                                val psi = PsiManager.getInstance(project).findFile(file)
-                                val document =
-                                    psi?.let { shouldProcess(it, headlessEnvironment, localScopeFiles) }
-                                if (document != null) {
-                                    return@compute psi
+                ApplicationManager.getApplication().runReadAction(
+                    Runnable {
+                        try {
+                            val fileIndex: FileIndex = ProjectRootManager.getInstance(project).fileIndex
+                            scope.accept { file: VirtualFile? ->
+                                ProgressManager.checkCanceled()
+                                if (isProjectOrWorkspaceFile(file!!) || !fileIndex.isInContent(file)) return@accept true
+                                val psiFile =
+                                    ReadAction.compute<PsiFile?, RuntimeException> {
+                                        if (project.isDisposed) throw ProcessCanceledException()
+                                        val psi = PsiManager.getInstance(project).findFile(file)
+                                        val document =
+                                            psi?.let { shouldProcess(it, headlessEnvironment, localScopeFiles) }
+                                        if (document != null) {
+                                            return@compute psi
+                                        }
+                                        null
+                                    }
+                                // do not inspect binary files
+                                if (psiFile != null) {
+                                    try {
+                                        if (ApplicationManager.getApplication().isReadAccessAllowed) {
+                                            outFilesToInspect.put(psiFile)
+                                        }
+                                    } catch (e: InterruptedException) {
+                                        logger.error("psiFile interrupted : " + psiFile.name, e)
+                                    } catch (e: IllegalStateException) {
+                                        logger.info("psiFile ignored : " + psiFile.name, e)
+                                    }
                                 }
-                                null
+                                ProgressManager.checkCanceled()
+                                true
                             }
-                        // do not inspect binary files
-                        if (psiFile != null) {
+                        } catch (e: ProcessCanceledException) {
+                            // ignore, but put tombstone
+                        } finally {
                             try {
-                                check(!ApplicationManager.getApplication().isReadAccessAllowed) { "Must not have read action" }
-                                outFilesToInspect.put(psiFile)
+                                outFilesToInspect.put(PsiUtilCore.NULL_PSI_FILE)
                             } catch (e: InterruptedException) {
                                 logger.error(e)
                             }
                         }
-                        ProgressManager.checkCanceled()
-                        true
                     }
-                } catch (e: ProcessCanceledException) {
-                    // ignore, but put tombstone
-                } finally {
-                    try {
-                        outFilesToInspect.put(PsiUtilCore.NULL_PSI_FILE)
-                    } catch (e: InterruptedException) {
-                        logger.error(e)
-                    }
-                }
+                )
             }
         }
         return (ProgressManager.getInstance() as CoreProgressManager).runProcessWithProgressAsynchronously(

idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/component/AliProjectComponent.kt

@@ -22,8 +22,9 @@ import com.alibaba.p3c.idea.inspection.AliPmdInspectionInvoker
 import com.alibaba.p3c.idea.pmd.SourceCodeProcessor
 import com.alibaba.p3c.idea.util.withLockNotInline
 import com.alibaba.smartfox.idea.common.component.AliBaseProjectComponent
+import com.alibaba.smartfox.idea.common.util.getService
 import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileEvent
 import com.intellij.openapi.vfs.VirtualFileListener
@@ -39,10 +40,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock
  * @author caikang
  * @date 2016/12/13
  */
-class AliProjectComponent(
-        private val project: Project,
-        val p3cConfig: P3cConfig
-) : AliBaseProjectComponent {
+class AliProjectComponent : AliBaseProjectComponent {
     private val listener: VirtualFileListener
     private val javaExtension = ".java"
     private val velocityExtension = ".vm"
@@ -57,7 +55,9 @@ class AliProjectComponent(
         listener = object : VirtualFileListener {
             override fun contentsChanged(event: VirtualFileEvent) {
                 val path = getFilePath(event) ?: return
+                val project = ProjectManager.getInstance().defaultProject
                 PsiManager.getInstance(project).findFile(event.file) ?: return
+                val p3cConfig = P3cConfig::class.java.getService()
                 if (!p3cConfig.ruleCacheEnable) {
                     AliPmdInspectionInvoker.refreshFileViolationsCache(event.file)
                 }
@@ -97,12 +97,14 @@ class AliProjectComponent(
     }
 
     override fun initComponent() {
+        val p3cConfig = P3cConfig::class.java.getService()
         I18nResources.changeLanguage(p3cConfig.locale)
         val analyticsGroup = ActionManager.getInstance().getAction(analyticsGroupId)
         analyticsGroup.templatePresentation.text = P3cBundle.getMessage(analyticsGroupText)
     }
 
     override fun projectOpened() {
+        val project = ProjectManager.getInstance().defaultProject
         Inspections.addCustomTag(project, "date")
         VirtualFileManager.getInstance().addVirtualFileListener(listener)
     }

idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/quickfix/ClassMustHaveAuthorQuickFix.kt

@@ -33,7 +33,7 @@ object ClassMustHaveAuthorQuickFix : InspectionGadgetsFix(), AliQuickFix {
 
     val tag = "@author ${System.getProperty("user.name") ?: System.getenv("USER")}"
 
-    override fun doFix(project: Project, descriptor: ProblemDescriptor?) {
+    override fun doFix(project: Project, descriptor: ProblemDescriptor) {
         descriptor ?: return
         val psiClass = descriptor.psiElement as? PsiClass
                 ?: descriptor.psiElement?.parent as? PsiClass

idea-plugin/p3c-common/src/main/kotlin/com/alibaba/p3c/idea/util/ProblemsUtils.kt

@@ -90,9 +90,15 @@ object ProblemsUtils {
             }
             endElement = psiElement
         }
-        return manager.createProblemDescriptor(psiElement, endElement,
-                desc, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly,
-                quickFix(psiElement))
+        val localQuickFix = quickFix(psiElement) ?: return null
+        return manager.createProblemDescriptor(
+            psiElement,
+            endElement,
+                desc,
+            ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+            isOnTheFly,
+            localQuickFix
+        )
     }
 
     private fun getEndElement(psiFile: PsiFile, psiElement: PsiElement, endOffset: Int): PsiElement {
@@ -146,10 +152,15 @@ object ProblemsUtils {
             quickFix: () -> LocalQuickFix? = {
                 QuickFixes.getQuickFix(ruleName, isOnTheFly)
             }
-    ): ProblemDescriptor {
-
+    ): ProblemDescriptor? {
+        val localQuickFix = quickFix();
+        if (localQuickFix == null) {
+            return manager.createProblemDescriptor(psiFile, textRange,
+                desc, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                isOnTheFly)
+        }
         return manager.createProblemDescriptor(psiFile, textRange,
                 desc, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                isOnTheFly, quickFix())
+                isOnTheFly, localQuickFix)
     }
 }

idea-plugin/p3c-idea/build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id 'java'
-    id "org.jetbrains.intellij" version "1.5.2"
+    id "org.jetbrains.intellij" version "1.13.3"
 
-    id "com.github.ben-manes.versions" version "0.46.0"
+    id "com.github.ben-manes.versions" version "0.50.0"
 }
 apply plugin: 'kotlin'
 apply plugin: 'idea'
 
-def myPlugins = ['git4idea']
+def myPlugins = []
 if (shouldIncludeJava(idea_version)) {
     myPlugins.add('java')
 }

idea-plugin/p3c-idea/src/main/resources/META-INF/plugin.xml

@@ -29,6 +29,12 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <ul>2.2.0.0x
+            <li>Fix idea 2023.1 2023.2 2023.3 compatibility issue</li>
+        </ul>
+        <ul>2.1.1.6x-SNAPSHOT
+            <li>Fix idea 2023.1-EAP compatibility issue</li>
+        </ul>
         <ul>2.1.1.5x
             <li>Migrate deprecated/removal idea function usages</li>
         </ul>
@@ -221,7 +227,7 @@
     ]]>
     </change-notes>
 
-    <idea-version since-build="2020.2.4"/>
+    <idea-version since-build="231.8109.175"/>
 
     <depends optional="true" config-file="pluginWithJava.xml">com.intellij.modules.java</depends>
     <depends>com.intellij.modules.platform</depends>

idea-plugin/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.12.3"
+    id "com.gradle.enterprise" version "3.16.1"
 }
 gradleEnterprise {
     buildScan {

p3c-pmd/README.md

@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.5x</version>
+    <version>2.2.0.0x</version>
 </dependency>
 ```
 ### <font color="green">Gradle</font>