feature: Enhance CallGraph with MethodSigGraph integration and search functionality

Author: springkill

src/main/kotlin/org/skgroup/securityinspector/analysis/graphs/callgraph/CallGraphBuilder.kt

@@ -8,10 +8,10 @@ import org.skgroup.securityinspector.analysis.ast.nodes.MethodSigNode
  * @author springkill
  * @version 1.0
  */
-data class MethodsigGraph(
+data class MethodSigGraph(
     val nodes: MutableSet<MethodSigNode> = LinkedHashSet(),
 ) {
-    fun merge(other: MethodsigGraph) {
+    fun merge(other: MethodSigGraph) {
         this.nodes.addAll(other.nodes)
     }
 }

…lysis/graphs/callgraph/MethodsigGraph.kt …lysis/graphs/callgraph/MethodSigGraph.ktsrc/main/kotlin/org/skgroup/securityinspector/analysis/graphs/callgraph/MethodsigGraph.kt renamed to src/main/kotlin/org/skgroup/securityinspector/analysis/graphs/callgraph/MethodSigGraph.kt src/main/kotlin/org/skgroup/securityinspector/analysis/graphs/callgraph/MethodsigGraph.kt renamed to src/main/kotlin/org/skgroup/securityinspector/analysis/graphs/callgraph/MethodSigGraph.kt

@@ -12,6 +12,7 @@ import com.intellij.ui.components.*
 import com.intellij.ui.content.ContentFactory
 import com.intellij.ui.treeStructure.Tree
 import com.intellij.util.ui.JBUI
+import org.skgroup.securityinspector.analysis.ast.nodes.BaseAstNode
 import org.skgroup.securityinspector.analysis.ast.nodes.MethodNode
 import org.skgroup.securityinspector.analysis.graphs.callgraph.CallGraph
 import org.skgroup.securityinspector.enums.AnalysisScope
@@ -46,6 +47,7 @@ class CallGraphUIComponents(val project: Project) {
     val sinkField = JBTextField(15)
     val searchButton = JButton("Search")
 
+    val findMethodButton = JButton("Find Method")
     val containInfo = JBCheckBox("Info").apply {
         addActionListener {
             val enabled = isSelected
@@ -60,6 +62,39 @@ class CallGraphUIComponents(val project: Project) {
         }
     }
 
+    val classNameLabel = JBLabel("Class Name:")
+    val classNameField = JBTextField(20)
+
+    val accessModifierLabel = JBLabel("Access Modifier:")
+    val accessModifierField = JBTextField(10)
+
+    val methodModifierLabel = JBLabel("Method Modifier:")
+    val methodModifierField = JBTextField(10)
+
+    val methodNameLabel = JBLabel("Method Name:")
+    val methodNameField = JBTextField(15)
+
+    val paramCountLabel = JBLabel("Param Count:")
+    val paramCountField = JBTextField(5)
+
+    val paramTypeLabel = JBLabel("Param Type:")
+    val paramTypeField = JBTextField(15)
+
+    val paramNameLabel = JBLabel("Param Name:")
+    val paramNameField = JBTextField(15)
+
+    val varargsLabel = JBLabel("Varargs:")
+    val varargsField = JBTextField(5)
+
+    val throwsClauseLabel = JBLabel("Throws Clause:")
+    val throwsClauseField = JBTextField(15)
+
+    val returnTypeLabel = JBLabel("Return Type:")
+    val returnTypeField = JBTextField(15)
+
+    val annotationsLabel = JBLabel("Annotations:")
+    val annotationsField = JBTextField(20)
+
     val systemPlatformLabel =
         JBLabel("System Plat: ${System.getProperty("os.name")}", LEFT).apply {
             border = JBUI.Borders.empty(5)
@@ -119,37 +154,50 @@ class CallGraphUIComponents(val project: Project) {
         }
 
         val fields = listOf(
-            "Class Name:" to JBTextField(20),
-            "Access Modifier:" to JBTextField(10),
-            "Method Modifier:" to JBTextField(10),
-            "Method Name:" to JBTextField(15),
-            "Param Count:" to JBTextField(5),
-            "Param Type:" to JBTextField(15),
-            "Param Name:" to JBTextField(15),
-            "Varargs:" to JBTextField(5),
-            "Throws Clause:" to JBTextField(15),
-            "Return Type:" to JBTextField(15),
-            "Annotations:" to JBTextField(20)
+            classNameLabel,
+            classNameField,
+            accessModifierLabel,
+            accessModifierField,
+            methodModifierLabel,
+            methodModifierField,
+            methodNameLabel,
+            methodNameField,
+            paramCountLabel,
+            paramCountField,
+            paramTypeLabel,
+            paramTypeField,
+            paramNameLabel,
+            paramNameField,
+            varargsLabel,
+            varargsField,
+            throwsClauseLabel,
+            throwsClauseField,
+            returnTypeLabel,
+            returnTypeField,
+            annotationsLabel,
+            annotationsField,
         )
 
-        fields.forEachIndexed { index, (labelText, textField) ->
-            c.gridx = 0
-            c.gridy = index
-            c.weightx = 0.0
-            add(JBLabel(labelText), c)
-
-            c.gridx = 1
-            c.weightx = 1.0
-            add(textField, c)
+        fields.forEachIndexed { index, it ->
+            if (it is JBLabel) {
+                c.gridx = 0
+                c.gridy = index
+                c.weightx = 0.0
+                add(it, c)
+            } else {
+                c.gridx = 1
+                c.gridy = index - 1
+                c.weightx = 1.0
+                add(it, c)
+            }
         }
 
         c.gridx = 0
         c.gridy = fields.size
         c.gridwidth = 2
         c.fill = GridBagConstraints.NONE
         c.anchor = GridBagConstraints.CENTER
-        val actionButton = JButton("Find Method")
-        add(actionButton, c)
+        add(findMethodButton, c)
     }
 
     val toggleButton = JButton("Toggle Panel")
@@ -162,7 +210,7 @@ class CallGraphUIComponents(val project: Project) {
         val centerPanel = createCenterPanel()
         splitter = JBSplitter(false, 0.8f).apply {
             firstComponent = centerPanel
-            secondComponent = methodFinderPanel
+            secondComponent = null
             dividerWidth = 5
         }
         mainPanel.add(splitter, BorderLayout.CENTER)
@@ -214,21 +262,23 @@ class CallGraphUIComponents(val project: Project) {
         panel.add(JBLabel("ROOT:"), c)
 
         c.gridx = 1
-        c.weightx = 0.0
         panel.add(sourceField, c)
 
         c.gridx = 2
-        c.weightx = 0.0
         panel.add(JBLabel("SINK:"), c)
 
         c.gridx = 3
-        c.weightx = 0.0
         panel.add(sinkField, c)
 
         c.gridx = 4
-        c.weightx = 0.0
         panel.add(searchButton, c)
 
+        c.gridx = 5
+        panel.add(containInfo, c)
+
+        c.gridx = 6
+        panel.add(containPath, c)
+
         c.weightx = 0.0
 
         c.gridx = 0
@@ -267,10 +317,10 @@ class CallGraphUIComponents(val project: Project) {
                     // 取出这个节点的 userObject
                     val userObject = node.userObject
 
-                    if (userObject is MethodNode) {
+                    if (userObject is BaseAstNode) {
                         val offset = userObject.sourceSpan
                         offset?.let {
-                            OpenFileDescriptor(project, it.virtualFile, offset.offset).navigate(true)
+                            OpenFileDescriptor(project, it.virtualFile, offset.offset-1).navigate(true)
                         }
                     }
                 }
@@ -368,7 +418,7 @@ class CallGraphUIComponents(val project: Project) {
     init {
         var isPanelVisible = true
         toggleButton.addActionListener {
-            if (isPanelVisible) {
+            if (!isPanelVisible) {
                 // 隐藏面板：将 secondComponent 设置为 null
                 splitter.secondComponent = null
             } else {

src/main/kotlin/org/skgroup/securityinspector/ui/component/CallGraphUIComponents.kt

@@ -41,13 +41,33 @@ class CallGraphToolWindowPanel(private val project: Project) {
             CallGraphSearcher.search(
                 sourceField = uiComponents.sourceField,
                 sinkField = uiComponents.sinkField,
-//                infoArea = uiComponents.infoArea,
                 searchResultRootNode = uiComponents.searchResultRootNode,
                 searchResultTreeModel = uiComponents.searchResultTreeModel,
                 project = project
             )
         }
 
+        uiComponents.findMethodButton.addActionListener {
+            val sigGraph = service.getMethodSigGraph()
+            sigGraph?.let {
+                CallGraphSearcher.search(
+                    it,
+                    uiComponents.classNameField.text,
+                    uiComponents.accessModifierField.text,
+                    uiComponents.methodModifierField.text,
+                    uiComponents.methodNameField.text,
+                    uiComponents.paramCountField.text.toIntOrNull(),
+                    uiComponents.paramTypeField.text,
+                    uiComponents.paramNameField.text,
+                    uiComponents.varargsField.text,
+                    uiComponents.throwsClauseField.text,
+                    uiComponents.returnTypeField.text,
+                    uiComponents.annotationsField.text,
+                    uiComponents.searchResultRootNode,
+                    uiComponents.searchResultTreeModel
+                )
+            }
+        }
     }
 
     private fun loadPersistedState() {

src/main/kotlin/org/skgroup/securityinspector/ui/panel/CallGraphToolWindowPanel.kt

@@ -1,6 +1,7 @@
 package org.skgroup.securityinspector.ui.renderer
 
 import org.skgroup.securityinspector.analysis.ast.nodes.MethodNode
+import org.skgroup.securityinspector.analysis.ast.nodes.MethodSigNode
 import org.skgroup.securityinspector.enums.RefMode
 import org.skgroup.securityinspector.utils.IconUtil
 import java.awt.Component
@@ -45,6 +46,11 @@ class ResultTreeRenderer : DefaultTreeCellRenderer() {
                     userObject
                 }
 
+                is MethodSigNode -> {
+                    icon = IconUtil.newIcon
+                    "${userObject.className}# ${userObject.methodName}"
+                }
+
                 else -> userObject.toString()
             }
         }

src/main/kotlin/org/skgroup/securityinspector/ui/renderer/ResultTreeRenderer.kt

@@ -7,16 +7,15 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.*
-import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.ProjectScope
 import com.intellij.psi.search.searches.ReferencesSearch
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.ui.Gray
 import org.skgroup.securityinspector.analysis.ast.nodes.MethodNode
 import org.skgroup.securityinspector.analysis.graphs.callgraph.CallGraph
 import org.skgroup.securityinspector.analysis.graphs.callgraph.CallGraphBuilder
+import org.skgroup.securityinspector.analysis.graphs.callgraph.MethodSigGraph
 import org.skgroup.securityinspector.enums.AnalysisScope
 import org.skgroup.securityinspector.ui.component.CallGraphUIComponents
 import org.skgroup.securityinspector.ui.component.ModuleSelectorDialog
@@ -47,6 +46,7 @@ object CallGraphGenerator {
 
         ProgressManager.getInstance().run(object : Task.Backgroundable(project, "Generating CallGraph", true) {
             private var newGraph: CallGraph? = null
+            private var sigGraph: MethodSigGraph? = null
             private lateinit var javaFiles: List<PsiFile>
 
             //private var scope = ProjectScope.getAllScope(project)
@@ -98,7 +98,7 @@ object CallGraphGenerator {
                     ApplicationManager.getApplication().runReadAction {
                         if (psiFile is PsiJavaFile) {
                             if (processedFiles.add(psiFile)) {
-                                PsiTreeUtil.findChildrenOfType(psiFile, PsiMethod::class.java).forEach{
+                                PsiTreeUtil.findChildrenOfType(psiFile, PsiMethod::class.java).forEach {
                                     it.accept(builder)
                                 }
 //                                psiFile.accept(builder)
@@ -115,6 +115,7 @@ object CallGraphGenerator {
                 }
 
                 newGraph = builder.getCallGraph(project)
+                sigGraph = builder.getMethodSigGraph()
             }
 
             override fun onSuccess() {
@@ -126,6 +127,11 @@ object CallGraphGenerator {
                         updateRootList(graph, rootListModel)
                     }
                 }
+
+                ApplicationManager.getApplication().invokeLater {
+                    sigGraph?.let { CallGraphMemoryService.getInstance(project).setMethodSigGraph(it) }
+                }
+
             }
 
             override fun onFinished() {

src/main/kotlin/org/skgroup/securityinspector/ui/service/CallGraphGenerator.kt

@@ -3,6 +3,7 @@ package org.skgroup.securityinspector.ui.service
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import org.skgroup.securityinspector.analysis.graphs.callgraph.CallGraph
+import org.skgroup.securityinspector.analysis.graphs.callgraph.MethodSigGraph
 
 /**
  * 类描述：CallGraphMemoryService 类用于在内存中维护 CallGraph 实例
@@ -16,11 +17,13 @@ class CallGraphMemoryService(private val project: Project) {
 
     // 内存中维护的图结构
     private var callGraph: CallGraph? = null
+    private var methodSigGraph: MethodSigGraph? = null
 
     /**
      * 获取当前内存中的调用图（可能为空）
      */
     fun getCallGraph(): CallGraph? = callGraph
+    fun getMethodSigGraph(): MethodSigGraph? = methodSigGraph
 
     /**
      * Set call graph 设置（更新）新的调用图
@@ -31,6 +34,10 @@ class CallGraphMemoryService(private val project: Project) {
         callGraph = newGraph
     }
 
+    fun setMethodSigGraph(newGraph: MethodSigGraph) {
+        methodSigGraph = newGraph
+    }
+
     companion object {
         fun getInstance(project: Project): CallGraphMemoryService {
             return project.getService(CallGraphMemoryService::class.java)