feat(codemodel): enhance ClassStructure and MethodStructure formatting …

…#14

Update ClassStructure and MethodStructure in codemodel to improve code formatting. Add methods to get field names and method signatures in ClassStructure. Refactor initialization of classContext in MethodStructure. Make fanInOut property public in MethodStructure.

core/src/main/kotlin/com/phodal/shirecore/codemodel/model/ClassStructure.kt

@@ -1,7 +1,10 @@
 package com.phodal.shirecore.codemodel.model
 
+import com.intellij.openapi.application.runReadAction
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
+import com.phodal.shirecore.codemodel.MethodStructureProvider
+import com.phodal.shirecore.codemodel.VariableStructureProvider
 import com.phodal.shirecore.codemodel.base.FormatableElement
 
 class ClassStructure(
@@ -15,5 +18,39 @@ class ClassStructure(
     val annotations: List<String> = mutableListOf(),
     val usages: List<PsiReference> = emptyList(),
 ) : FormatableElement(root, text, name) {
+    private fun getFieldNames(): List<String> = fields.mapNotNull {
+        VariableStructureProvider.from(it, false, false, false)?.shortFormat()
+    }
 
+    private fun getMethodSignatures(): List<String> = methods.mapNotNull {
+        MethodStructureProvider.from(it, false, gatherUsages = false)?.signature
+    }
+
+    override fun format(): String {
+        val className = name ?: "_"
+        val classFields = getFieldNames().joinToString(separator = "\n  ")
+        val superClasses = when {
+            superClasses.isNullOrEmpty() -> ""
+            else -> " : ${superClasses.joinToString(separator = ", ")}"
+        }
+        val methodSignatures = getMethodSignatures()
+            .filter { it.isNotBlank() }.joinToString(separator = "\n  ") { method ->
+                "+ $method"
+            }
+
+        val filePath = displayName ?: runReadAction { root.containingFile?.virtualFile?.path }
+        val annotations = if (annotations.isEmpty()) {
+            ""
+        } else {
+            "\n'" + annotations.joinToString(separator = ", ")
+        }
+
+        return """
+        |'package: $filePath$annotations
+        |class $className$superClasses {
+        |  $classFields
+        |  $methodSignatures
+        |}
+    """.trimMargin()
+    }
 }

core/src/main/kotlin/com/phodal/shirecore/codemodel/model/MethodStructure.kt

@@ -1,6 +1,5 @@
 package com.phodal.shirecore.codemodel.model
 
-import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 import com.phodal.shirecore.codemodel.ClassStructureProvider
@@ -18,17 +17,12 @@ class MethodStructure(
     val paramNames: List<String> = emptyList(),
     val includeClassContext: Boolean = false,
     val usages: List<PsiReference> = emptyList(),
-    private val fanInOut: List<PsiElement> = emptyList(),
+    val fanInOut: List<PsiElement> = emptyList(),
 ) : FormatableElement(root, text, name) {
-    private val classContext: ClassStructure?
-    private val project: Project = root.project
-
-    init {
-        classContext = if (includeClassContext && enclosingClass != null) {
-            ClassStructureProvider.from(enclosingClass, false)
-        } else {
-            null
-        }
+    private val classContext: ClassStructure? = if (includeClassContext && enclosingClass != null) {
+        ClassStructureProvider.from(enclosingClass, false)
+    } else {
+        null
     }
 
     override fun format(): String {
@@ -64,7 +58,7 @@ class MethodStructure(
             val context: ClassStructure = ClassStructureProvider.from(it, false) ?: return@forEach
             val element = context.root
 
-            if (!isInProject(element.containingFile?.virtualFile!!, project)) {
+            if (!isInProject(element.containingFile?.virtualFile!!, root.project)) {
                 return@forEach
             }