refactor: Refactor PsiClassHelper utilities (#1248)

The changes centralize PsiClass-related utilities and improve code organization while maintaining functionality.

Author: tangcent

gradle.properties

@@ -3,4 +3,4 @@ plugin_version=2.8.1.212.0
 kotlin.code.style=official
 kotlin_version=2.1.0
 junit_version=5.9.2
-itangcent_intellij_version=1.7.7
+itangcent_intellij_version=1.7.9

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/actions/ApiExportAction.kt

@@ -4,11 +4,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.Project
 import com.itangcent.idea.plugin.api.cache.DefaultFileApiCacheRepository
 import com.itangcent.idea.plugin.api.cache.FileApiCacheRepository
-import com.itangcent.idea.plugin.api.export.core.ClassExporter
-import com.itangcent.idea.plugin.api.export.spring.SpringRequestClassExporter
 import com.itangcent.idea.plugin.config.EnhancedConfigReader
 import com.itangcent.idea.plugin.rule.SuvRuleParser
-import com.itangcent.idea.utils.CustomizedPsiClassHelper
+import com.itangcent.idea.psi.CustomizedPsiClassHelper
 import com.itangcent.idea.utils.RuleComputeListenerRegistry
 import com.itangcent.intellij.config.ConfigReader
 import com.itangcent.intellij.config.rule.RuleComputeListener
@@ -27,7 +25,6 @@ abstract class ApiExportAction(text: String) : BasicAnAction(text) {
 
         builder.bind(RuleParser::class) { it.with(SuvRuleParser::class).singleton() }
         builder.bind(RuleComputeListener::class) { it.with(RuleComputeListenerRegistry::class).singleton() }
-        builder.bind(PsiClassHelper::class) { it.with(CustomizedPsiClassHelper::class).singleton() }
 
         builder.bind(FileApiCacheRepository::class) { it.with(DefaultFileApiCacheRepository::class).singleton() }
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/actions/FieldsToMessageAction.kt

@@ -8,7 +8,6 @@ import com.intellij.psi.PsiType
 import com.itangcent.common.logger.traceError
 import com.itangcent.idea.plugin.config.EnhancedConfigReader
 import com.itangcent.idea.plugin.rule.SuvRuleParser
-import com.itangcent.idea.utils.CustomizedPsiClassHelper
 import com.itangcent.idea.utils.RuleComputeListenerRegistry
 import com.itangcent.intellij.config.ConfigReader
 import com.itangcent.intellij.config.rule.RuleComputeListener
@@ -20,7 +19,6 @@ import com.itangcent.intellij.extend.guice.with
 import com.itangcent.intellij.file.DefaultLocalFileRepository
 import com.itangcent.intellij.file.LocalFileRepository
 import com.itangcent.intellij.jvm.JvmClassHelper
-import com.itangcent.intellij.jvm.PsiClassHelper
 import com.itangcent.intellij.logger.Logger
 import com.itangcent.intellij.psi.ContextSwitchListener
 import com.itangcent.intellij.util.ActionUtils
@@ -54,7 +52,6 @@ abstract class FieldsToMessageAction : BasicAnAction {
         builder.bind(LocalFileRepository::class) { it.with(DefaultLocalFileRepository::class).singleton() }
 
         builder.bind(RuleComputeListener::class) { it.with(RuleComputeListenerRegistry::class).singleton() }
-        builder.bind(PsiClassHelper::class) { it.with(CustomizedPsiClassHelper::class).singleton() }
         builder.bind(ConfigReader::class) { it.with(EnhancedConfigReader::class).singleton() }
     }
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/actions/YapiExportAction.kt

@@ -34,8 +34,6 @@ class YapiExportAction : ApiExportAction("Export Yapi") {
         builder.bindInstance("file.save.default", "yapi.json")
         builder.bindInstance("file.save.last.location.key", "com.itangcent.yapi.export.path")
 
-        builder.bind(PsiClassHelper::class) { it.with(YapiPsiClassHelper::class).singleton() }
-
         builder.bind(YapiTokenChecker::class) { it.with(YapiTokenCheckerSupport::class).singleton() }
 
         builder.bind(AdditionalParseHelper::class) { it.with(YapiAdditionalParseHelper::class).singleton() }

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/cache/CachedRequestClassExporter.kt

@@ -16,8 +16,8 @@ import com.itangcent.idea.psi.PsiMethodResource
 import com.itangcent.idea.psi.resourceMethod
 import com.itangcent.intellij.context.ActionContext
 import com.itangcent.intellij.extend.withBoundary
+import com.itangcent.intellij.jvm.psi.PsiClassUtil
 import com.itangcent.intellij.logger.Logger
-import com.itangcent.intellij.psi.PsiClassUtils
 import com.itangcent.intellij.util.ActionUtils
 import com.itangcent.intellij.util.FileUtils
 import java.io.File
@@ -87,7 +87,7 @@ class CachedRequestClassExporter : ClassExporter {
                 actionContext.withBoundary {
                     delegateClassExporter.export(cls, requestOnly { request ->
                         docHandle(request)
-                        val fullName = PsiClassUtils.fullNameOfMember(cls, request.resourceMethod()!!)
+                        val fullName = PsiClassUtil.fullNameOfMember(cls, request.resourceMethod()!!)
                         requests.add(
                             RequestWithKey(
                                 fullName, request
@@ -116,7 +116,7 @@ class CachedRequestClassExporter : ClassExporter {
         cls: PsiClass, fileApiCache: FileApiCache, requestHandle: DocHandle,
     ) {
         fileApiCache.requests?.forEach { request ->
-            val method = request.key?.let { PsiClassUtils.findMethodFromFullName(it, cls as PsiElement) }
+            val method = request.key?.let { PsiClassUtil.findMethodFromFullName(it, cls as PsiElement) }
             if (method == null) {
                 logger.warn("${request.key} not be found")
                 return@forEach

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/cache/FileApiCache.kt

@@ -77,7 +77,7 @@ class RequestWithKey {
     /**
      * maybe full name of method
      *
-     * @see com.itangcent.intellij.psi.PsiClassUtils.fullNameOfMethod
+     * @see com.itangcent.intellij.jvm.psi.PsiClassUtil .fullNameOfMethod
      */
     var key: String? = null
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/dashboard/ApiDashboardService.kt

@@ -55,9 +55,8 @@ import com.itangcent.intellij.extend.guice.singleton
 import com.itangcent.intellij.extend.guice.with
 import com.itangcent.intellij.extend.withBoundary
 import com.itangcent.intellij.file.LocalFileRepository
-import com.itangcent.intellij.jvm.PsiClassHelper
+import com.itangcent.intellij.jvm.psi.PsiClassUtil
 import com.itangcent.intellij.logger.Logger
-import com.itangcent.intellij.psi.PsiClassUtils
 import com.itangcent.intellij.util.FileType
 import com.itangcent.suv.http.CookiePersistenceHelper
 import com.itangcent.suv.http.HttpClientProvider
@@ -168,7 +167,6 @@ class ApiDashboardService(private val project: Project) {
         builder.bind(ClassExporter::class) { it.with(CachedRequestClassExporter::class).singleton() }
         builder.bind(LocalFileRepository::class) { it.with(ProjectCacheRepository::class).singleton() }
         builder.bindInstance(ExportDoc::class, ExportDoc.of("request"))
-        builder.bind(PsiClassHelper::class) { it.with(CustomizedPsiClassHelper::class).singleton() }
         builder.bind(MethodFilter::class) { it.with(CustomizedMethodFilter::class).singleton() }
         builder.bind(ConfigReader::class) { it.with(EnhancedConfigReader::class).singleton() }
         builder.bind(RuleParser::class) { it.with(SuvRuleParser::class).singleton() }
@@ -577,7 +575,7 @@ class ApiDashboardService(private val project: Project) {
 
     private fun Request.cacheKey(): String {
         return actionContext.callInReadUI {
-            PsiClassUtils.fullNameOfMember(resourceClass(), resourceMethod()!!)
+            PsiClassUtil.fullNameOfMember(resourceClass(), resourceMethod()!!)
         } ?: path?.url() ?: ""
     }
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/core/RequestClassExporter.kt

@@ -31,9 +31,9 @@ import com.itangcent.intellij.jvm.duck.DuckType
 import com.itangcent.intellij.jvm.duck.SingleDuckType
 import com.itangcent.intellij.jvm.element.ExplicitElement
 import com.itangcent.intellij.jvm.element.ExplicitMethod
+import com.itangcent.intellij.jvm.psi.PsiClassUtil
 import com.itangcent.intellij.logger.Logger
 import com.itangcent.intellij.psi.ContextSwitchListener
-import com.itangcent.intellij.psi.PsiClassUtils
 import com.itangcent.intellij.util.*
 import kotlin.reflect.KClass
 
@@ -804,7 +804,7 @@ abstract class RequestClassExporter : ClassExporter {
 
             this.intelligentSettingsHelper.inferEnable() && !duckTypeHelper.isQualified(duckType)
                 -> {
-                logger.info("try infer return type of method[" + PsiClassUtils.fullNameOfMethod(method.psi()) + "]")
+                logger.info("try infer return type of method[" + PsiClassUtil.fullNameOfMethod(method.psi()) + "]")
                 methodReturnInferHelper!!.inferReturn(method.psi())
             }
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/feign/RequestLineRequestMappingResolver.kt

@@ -8,7 +8,7 @@ import com.itangcent.idea.plugin.api.export.spring.SpringRequestMappingResolver
 import com.itangcent.idea.plugin.condition.ConditionOnSetting
 import com.itangcent.intellij.jvm.AnnotationHelper
 import com.itangcent.intellij.logger.Logger
-import com.itangcent.intellij.psi.PsiClassUtils
+import com.itangcent.intellij.jvm.psi.PsiClassUtil 
 import com.itangcent.order.Order
 import com.itangcent.order.Ordered
 import java.util.regex.Matcher
@@ -40,14 +40,14 @@ class RequestLineRequestMappingResolver : SpringRequestMappingResolver {
             annotationHelper.findAttrAsString(psiElement, SpringFeignClassName.REQUEST_LINE_ANNOTATION) ?: return null
 
         if (requestLineValue.isEmpty()) {
-            logger.error("RequestLine annotation was empty on method ${PsiClassUtils.fullNameOfMember(psiElement)}.")
+            logger.error("RequestLine annotation was empty on method ${PsiClassUtil.fullNameOfMember(psiElement)}.")
             return null
         }
         val requestLineMatcher: Matcher = REQUEST_LINE_PATTERN.matcher(requestLineValue)
         if (!requestLineMatcher.find()) {
             logger.error(
                 "RequestLine annotation didn't start with an HTTP verb on method ${
-                    PsiClassUtils.fullNameOfMember(
+                    PsiClassUtil.fullNameOfMember(
                         psiElement
                     )
                 }"

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/generic/GenericMethodDocClassExporter.kt

@@ -29,7 +29,7 @@ import com.itangcent.intellij.jvm.element.ExplicitMethod
 import com.itangcent.intellij.jvm.element.ExplicitParameter
 import com.itangcent.intellij.logger.Logger
 import com.itangcent.intellij.psi.ContextSwitchListener
-import com.itangcent.intellij.psi.PsiClassUtils
+import com.itangcent.intellij.jvm.psi.PsiClassUtil 
 import com.itangcent.order.Order
 import com.itangcent.utils.disposable
 import kotlin.reflect.KClass
@@ -371,7 +371,7 @@ open class GenericMethodDocClassExporter : ClassExporter {
         return when {
             needInfer() && (!duckTypeHelper!!.isQualified(duckType) ||
                     jvmClassHelper.isInterface(duckType)) -> {
-                logger.info("try infer return type of method[" + PsiClassUtils.fullNameOfMethod(methodExportContext.psi()) + "]")
+                logger.info("try infer return type of method[" + PsiClassUtil.fullNameOfMethod(methodExportContext.psi()) + "]")
                 methodInferHelper!!.inferReturn(methodExportContext.psi())
 //                actionContext!!.callWithTimeout(20000) { methodReturnInferHelper.inferReturn(method) }
             }