alibaba · XenoAmess · Mar 26, 2020
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
@@ -1,8 +1,8 @@
-kotlin_version=1.3.50
+kotlin_version=1.3.71
+idea_version=IU-201.6073.9-EAP-SNAPSHOT
 #idea_version=171.3780.15
-idea_version=145.258.11
+#idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
-gradle_jetbrains_version=0.4.5
+gradle_jetbrains_version=0.4.16
 systemProp.file.encoding=UTF-8
-
 plugin_version=2.0.1
diff --git a/idea-plugin/gradlew b/idea-plugin/gradlew
diff --git a/idea-plugin/p3c-common/build.gradle b/idea-plugin/p3c-common/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-    id "org.jetbrains.intellij" version '0.4.5'
+    id 'java'
+    id "org.jetbrains.intellij" version "0.4.16"
 }
 apply plugin: 'kotlin'
 apply plugin: 'idea'
@@ -28,7 +29,7 @@ artifacts {
 
 def myPlugins = []
 
-if (idea_version.startsWith('193.') || idea_version.startsWith('2019.3')) {
+if (idea_version.startsWith('193.') || idea_version.startsWith('2019.3') || idea_version.startsWith('IU-201.')) {
     myPlugins = ['java']
 }
 

diff --git a/...ent/CommonSettingsApplicationComponent.kt → ...mmonSettingsApplicationStartupActivity.kt b/...ent/CommonSettingsApplicationComponent.kt → ...mmonSettingsApplicationStartupActivity.kt
@@ -13,25 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.p3c.idea.component
+package com.alibaba.p3c.idea.activity
 
 import com.alibaba.p3c.idea.config.P3cConfig
 import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.p3c.idea.util.HighlightInfoTypes
 import com.alibaba.p3c.idea.util.HighlightSeverities
 import com.alibaba.p3c.pmd.I18nResources
-import com.alibaba.smartfox.idea.common.component.AliBaseApplicationComponent
+import com.alibaba.smartfox.idea.common.activity.AliBaseApplicationStartupActivity
 import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.project.Project
 
 /**
  *
  *
  * @author caikang
  * @date 2017/06/19
  */
-class CommonSettingsApplicationComponent(private val p3cConfig: P3cConfig) : AliBaseApplicationComponent {
-    override fun initComponent() {
+class CommonSettingsApplicationStartupActivity() : AliBaseApplicationStartupActivity {
+    companion object {
+        val analyticsGroupId = "com.alibaba.p3c.analytics.action_group"
+        val analyticsGroupText = "$analyticsGroupId.text"
+        private val p3cConfig = P3cConfig()
+    }
+
+    override fun runActivity(project: Project) {
         SeverityRegistrar.registerStandard(HighlightInfoTypes.BLOCKER, HighlightSeverities.BLOCKER)
         SeverityRegistrar.registerStandard(HighlightInfoTypes.CRITICAL, HighlightSeverities.CRITICAL)
         SeverityRegistrar.registerStandard(HighlightInfoTypes.MAJOR, HighlightSeverities.MAJOR)
@@ -40,9 +47,4 @@ class CommonSettingsApplicationComponent(private val p3cConfig: P3cConfig) : Ali
         val analyticsGroup = ActionManager.getInstance().getAction(analyticsGroupId)
         analyticsGroup.templatePresentation.text = P3cBundle.getMessage(analyticsGroupText)
     }
-
-    companion object {
-        val analyticsGroupId = "com.alibaba.p3c.analytics.action_group"
-        val analyticsGroupText = "$analyticsGroupId.text"
-    }
 }
diff --git a/.../alibaba/p3c/idea/inspection/AliAccessToNonThreadSafeStaticFieldFromInstanceInspection.kt b/.../alibaba/p3c/idea/inspection/AliAccessToNonThreadSafeStaticFieldFromInstanceInspection.kt
@@ -17,14 +17,14 @@ package com.alibaba.p3c.idea.inspection
 
 import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.intellij.codeHighlighting.HighlightDisplayLevel
-import com.siyeh.ig.threading.AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase
+import com.siyeh.ig.threading.AccessToNonThreadSafeStaticFieldFromInstanceInspection
 
 /**
  * @author caikang
  * @date 2016/12/08
  */
 class AliAccessToNonThreadSafeStaticFieldFromInstanceInspection
-    : AccessToNonThreadSafeStaticFieldFromInstanceInspectionBase,
+    : AccessToNonThreadSafeStaticFieldFromInstanceInspection,
         AliBaseInspection {
     constructor()
     /**

diff --git a/...ommon/src/main/kotlin/com/alibaba/p3c/idea/inspection/AliWrapperTypeEqualityInspection.kt b/...ommon/src/main/kotlin/com/alibaba/p3c/idea/inspection/AliWrapperTypeEqualityInspection.kt
@@ -45,6 +45,7 @@ import org.jetbrains.annotations.NonNls
  */
 class AliWrapperTypeEqualityInspection : BaseInspection, AliBaseInspection {
     constructor()
+
     /**
      * For Javassist
      */
@@ -125,7 +126,7 @@ class AliWrapperTypeEqualityInspection : BaseInspection, AliBaseInspection {
 
     }
 
-    private class ArrayEqualityFix(private val deepEquals: Boolean) : InspectionGadgetsFix() {
+    private inner class ArrayEqualityFix(private val deepEquals: Boolean) : InspectionGadgetsFix() {
 
         override fun getName(): String {
             if (deepEquals) {
@@ -136,7 +137,7 @@ class AliWrapperTypeEqualityInspection : BaseInspection, AliBaseInspection {
         }
 
         override fun getFamilyName(): String {
-            return familyName
+            return this@AliWrapperTypeEqualityInspection.familyName
         }
 
         @Throws(IncorrectOperationException::class)

diff --git a/.../component/AliBaseApplicationComponent.kt → ...vity/AliBaseApplicationStartupActivity.kt b/.../component/AliBaseApplicationComponent.kt → ...vity/AliBaseApplicationStartupActivity.kt
@@ -13,25 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.smartfox.idea.common.component
+package com.alibaba.smartfox.idea.common.activity
 
-import com.alibaba.smartfox.idea.common.util.PluginVersions
-import com.intellij.openapi.components.ApplicationComponent
+import com.intellij.openapi.startup.StartupActivity
 
 /**
  *
  *
  * @author caikang
  * @date 2017/05/11
  */
-interface AliBaseApplicationComponent : ApplicationComponent {
-    override fun getComponentName(): String {
-        return "${PluginVersions.pluginId.idString}-${javaClass.name}"
-    }
-
-    override fun disposeComponent() {
-    }
-
-    override fun initComponent() {
-    }
+interface AliBaseApplicationStartupActivity : StartupActivity {
 }
diff --git a/idea-plugin/p3c-idea/build.gradle b/idea-plugin/p3c-idea/build.gradle
@@ -1,12 +1,13 @@
 plugins {
-    id "org.jetbrains.intellij" version '0.4.5'
+    id 'java'
+    id "org.jetbrains.intellij" version "0.4.16"
 }
 apply plugin: 'kotlin'
 apply plugin: 'idea'
 
 def myPlugins = ['git4idea']
 
-if (idea_version.startsWith('193.') || idea_version.startsWith('2019.3')) {
+if (idea_version.startsWith('193.') || idea_version.startsWith('2019.3') || idea_version.startsWith('IU-201.')) {
     myPlugins = ['git4idea', 'java']
 }
 

diff --git a/idea-plugin/p3c-idea/src/main/resources/META-INF/p3c.xml b/idea-plugin/p3c-idea/src/main/resources/META-INF/p3c.xml
@@ -1,10 +1,4 @@
 <idea-plugin>
-    <application-components>
-        <component>
-            <implementation-class>com.alibaba.p3c.idea.component.CommonSettingsApplicationComponent
-            </implementation-class>
-        </component>
-    </application-components>
     <project-components>
         <component>
             <implementation-class>com.alibaba.p3c.idea.component.AliProjectComponent</implementation-class>
@@ -44,10 +38,16 @@
                         interface="com.alibaba.p3c.idea.ep.InspectionActionExtensionPoint"/>
     </extensionPoints>
     <extensions defaultExtensionNs="com.intellij">
-        <applicationService serviceImplementation="com.alibaba.p3c.idea.config.P3cConfig"/>
-        <projectService serviceImplementation="com.alibaba.p3c.idea.config.SmartFoxProjectConfig"/>
-        <checkinHandlerFactory implementation="com.alibaba.p3c.idea.vcs.AliCodeAnalysisCheckinHandlerFactory"
-                               order="first"/>
-        <inspectionToolProvider implementation="com.alibaba.p3c.idea.inspection.AliLocalInspectionToolProvider"/>
+        <applicationService
+                serviceImplementation="com.alibaba.p3c.idea.config.P3cConfig"/>
+        <projectService
+                serviceImplementation="com.alibaba.p3c.idea.config.SmartFoxProjectConfig"/>
+        <checkinHandlerFactory
+                implementation="com.alibaba.p3c.idea.vcs.AliCodeAnalysisCheckinHandlerFactory"
+                order="first"/>
+        <inspectionToolProvider
+                implementation="com.alibaba.p3c.idea.inspection.AliLocalInspectionToolProvider"/>
+        <postStartupActivity
+                implementation="com.alibaba.p3c.idea.activity.CommonSettingsApplicationStartupActivity"/>
     </extensions>
 </idea-plugin>
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
diff --git a/p3c-formatter/eclipse-codestyle.xml b/p3c-formatter/eclipse-codestyle.xml
diff --git a/p3c-pmd/pom.xml b/p3c-pmd/pom.xml
@@ -253,24 +253,6 @@
           </tags>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
      <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>