Merge pull request #33 from XenoAmess/xenoamess_maintain_fork_develop

Xenoamess maintain fork develop
XenoAmess · Aug 23, 2020 · b25a796 · b25a796
2 parents a90041a + c3a6e71
commit b25a796
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties
@@ -4,7 +4,7 @@ kotlin_version=1.4.0
 # See https://www.jetbrains.com/intellij-repository/releases/
 # See https://www.jetbrains.com/intellij-repository/snapshots/
 idea_version=201.7223.91
-#idea_version=171.3780.15
+#idea_version=181.5540.23
 #idea_version=145.258.11
 plugin_name=Alibaba Java Coding Guidelines
 systemProp.file.encoding=UTF-8

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
@@ -17,7 +17,6 @@ package com.alibaba.p3c.idea.action
 
 import com.alibaba.p3c.idea.compatible.inspection.InspectionProfileService
 import com.alibaba.p3c.idea.compatible.inspection.Inspections
-import com.alibaba.p3c.idea.ep.InspectionActionExtensionPoint
 import com.alibaba.p3c.idea.i18n.P3cBundle
 import com.alibaba.p3c.idea.inspection.AliBaseInspection
 import com.alibaba.p3c.idea.util.NumberConstants
@@ -30,7 +29,6 @@ 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.codeInspection.ui.InspectionResultsView
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -193,8 +191,17 @@ class AliInspectionAction : AnAction() {
             )
             InspectionProfileService.setExternalProfile(model, inspectionContext)
 
-            val toolWindow = project.getService(ToolWindowManager::class.java).getToolWindow(ToolWindowId.INSPECTION)
+            // toolWindowManager = ToolWindowManager.getInstance(project)
+            val toolWindowManagerClass = ToolWindowManager::class.java;
+            val method = try {
+                toolWindowManagerClass.getMethod("getInstance");
+            } catch (e : Exception) {
+                val innerClass = Class.forName(toolWindowManagerClass.canonicalName + ".Companion");
+                innerClass.getMethod("getInstance");
+            }
+            val toolWindowManager = method.invoke(null, project) as ToolWindowManager;
 
+            var toolWindow = toolWindowManager.getToolWindow(ToolWindowId.INSPECTION);
             if (toolWindow != null) {
                 val contentManager = toolWindow.contentManager
                 val contentTitle = title?.let {

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
@@ -163,8 +163,7 @@
     ]]>
     </change-notes>
 
-    <!--    <idea-version since-build="183.4284"/>-->
-    <idea-version since-build="145.0"/>
+    <idea-version since-build="181.5540.23"/>
 
     <depends optional="true" config-file="pluginWithJava.xml">com.intellij.modules.java</depends>
     <depends>com.intellij.modules.platform</depends>