Merge pull request #235 from XenoAmess/xenoamess_maintain_fork_develop

version to 2.1.1.4x
XenoAmess · Apr 14, 2022 · 586cf9a · 586cf9a
2 parents 9d2594c + 9d0351c
commit 586cf9a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
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.1.1.3x'
+compile 'com.xenoamess.p3c.idea:p3c-common:2.1.1.4x'
 ```
 ## [中文使用手册](README_cn.md)
 ## <font color="green">Install</font>

diff --git a/idea-plugin/gradle.properties b/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=201.7223.91
+idea_version=2022.1
 #idea_version=211-EAP-SNAPSHOT
 #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.3x
+plugin_version=2.1.1.4x
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
@@ -60,7 +60,10 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 dependencies {
     implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
-    implementation "com.xenoamess.p3c:p3c-pmd:$plugin_version"
+    implementation("com.xenoamess.p3c:p3c-pmd:$plugin_version") {
+        exclude group: 'org.apache.logging.log4j'
+        exclude group: 'org.slf4j'
+    }
     implementation group: 'org.javassist', name: 'javassist', version: '3.28.0-GA'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$project.kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$project.kotlin_version"

diff --git a/...tlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt b/...tlin/com/alibaba/p3c/idea/inspection/standalone/AliMissingOverrideAnnotationInspection.kt
@@ -29,6 +29,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
 import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.util.InheritanceUtil
+import com.jetbrains.rd.util.catch
 import com.siyeh.ig.BaseInspectionVisitor
 import com.siyeh.ig.InspectionGadgetsFix
 import com.siyeh.ig.inheritance.MissingOverrideAnnotationInspection
@@ -66,7 +67,12 @@ class AliMissingOverrideAnnotationInspection : MissingOverrideAnnotationInspecti
     override fun createOptionsPanel(): JComponent? = null
 
     override fun buildFix(vararg infos: Any): InspectionGadgetsFix? {
-        val fix = super.buildFix(*infos) ?: return null
+        val fix : InspectionGadgetsFix
+        try {
+            fix = super.buildFix(*infos) ?: return null
+        } catch (e: Exception){
+            return null;
+        }
         return DecorateInspectionGadgetsFix(
                 fix,
                 P3cBundle.getMessage("com.alibaba.p3c.idea.quickfix.standalone.AliMissingOverrideAnnotationInspection")

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,9 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <ul>2.1.1.4x
+            <li>Fix idea 2022.1 Ultimate compatibility issue</li>
+        </ul>
         <ul>2.1.1.3x
             <li>pmd upgrade to 6.44.0</li>
             <li>fix bugs of SneakyThrowsWithoutExceptionTypeRule</li>

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.1.1.3x</version>
+    <version>2.1.1.4x</version>
 </dependency>
 ```
 ### <font color="green">Gradle</font>

diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xenoamess.p3c</groupId>
     <artifactId>p3c-pmd</artifactId>
-    <version>2.1.1.3x</version>
+    <version>2.1.1.4x</version>
     <packaging>jar</packaging>
     <name>p3c-pmd</name>
     <properties>