Merge pull request #9 from tommykw/feature/inline-trait-viewer

Implement inline trait viewer with merged class display

Author: tommykw

src/main/kotlin/com/github/tommykw/phptraitinlineviewer/TraitMerger.kt

@@ -2,34 +2,77 @@ package com.github.tommykw.phptraitinlineviewer
 
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.LightVirtualFile
 import com.jetbrains.php.lang.PhpFileType
+import com.jetbrains.php.lang.psi.PhpFile
 import com.jetbrains.php.lang.psi.elements.PhpClass
+import com.jetbrains.php.lang.psi.elements.PhpUseList
 
 object TraitMerger {
     fun mergeClassWithTraits(phpClass: PhpClass): String {
         return buildString {
             append("<?php\n\n")
+
+            val namespace = phpClass.namespaceName?.trim('\\')
+            if (!namespace.isNullOrEmpty()) {
+                append("namespace $namespace;\n\n")
+            }
+
+            val phpFile = phpClass.containingFile as? PhpFile
+            phpFile?.let { file ->
+                val useStatements = PsiTreeUtil.findChildrenOfType(file, PhpUseList::class.java)
+                    .filter { useList ->
+                        PsiTreeUtil.getParentOfType(useList, PhpClass::class.java) == null
+                    }
+                if (useStatements.isNotEmpty()) {
+                    for (useList in useStatements) {
+                        append(useList.text)
+                        append("\n")
+                    }
+                    append("\n")
+                }
+            }
+
             append("class ${phpClass.name}Merged {\n")
 
             val traits = phpClass.traits
-
             for (trait in traits) {
                 append("    // ===== Trait: ${trait.name} =====\n\n")
 
+                for (field in trait.fields) {
+                    append("    ")
+                    append(field.text.replace("\n", "\n    "))
+                    append("\n\n")
+                }
+
                 for (method in trait.methods) {
                     append("    ")
                     append(method.text.replace("\n", "\n    "))
                     append("\n\n")
                 }
+            }
 
-                for (field in trait.fields) {
+            val ownFields = phpClass.ownFields
+            if (ownFields.isNotEmpty()) {
+                append("    // ===== Original Class Fields =====\n\n")
+                for (field in ownFields) {
                     append("    ")
                     append(field.text.replace("\n", "\n    "))
                     append("\n\n")
                 }
             }
 
+            val ownMethods = phpClass.ownMethods
+            if (ownMethods.isNotEmpty()) {
+                append("    // ===== Original Class Methods =====\n\n")
+                for (method in ownMethods) {
+                    append("    ")
+                    append(method.text.replace("\n", "\n    "))
+                    append("\n\n")
+                }
+            }
+
             append("}\n")
         }
     }