fix: fully qualified name

Author: BFergerson

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/detect/endpoint/VertxEndpoint.kt

@@ -35,9 +35,11 @@ import spp.jetbrains.marker.source.mark.guide.MethodGuideMark
 
 class VertxEndpoint : JVMEndpointDetector.JVMEndpointNameDetector {
 
-    private val log = logger<VertxEndpoint>()
-    private val httpMethods = HttpMethod.values().map { it.name() }.toSet()
-    private val DETECTED_ENDPOINT = Key.create<EndpointDetector.DetectedEndpoint>("VertxEndpoint.DetectedEndpoint")
+    companion object {
+        private val log = logger<VertxEndpoint>()
+        private val httpMethods = HttpMethod.values().map { it.name() }.toSet()
+        private val DETECTED_ENDPOINT = Key.create<EndpointDetector.DetectedEndpoint>("VertxEndpoint.DetectedEndpoint")
+    }
 
     override fun detectEndpointNames(guideMark: GuideMark): Future<List<EndpointDetector.DetectedEndpoint>> {
         if (guideMark !is MethodGuideMark) {

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt

@@ -197,12 +197,10 @@ object JVMMarkerUtils {
                     methodParams += "[]"
                 }
             } else if (it.typeElement != null) {
-                methodParams += if (it.typeElement!!.text == "String") {
-                    "java.lang.String"
-                } else if (it.typeElement!!.text == "String[]") {
-                    "java.lang.String[]"
-                } else {
-                    it.typeElement!!.text
+                methodParams += findFullyQualifiedName(it.type, it.containingFile) ?: when (it.typeElement!!.text) {
+                    "String" -> "java.lang.String"
+                    "String[]" -> "java.lang.String[]"
+                    else -> it.typeElement!!.text
                 }
             } else if (it.type is PsiPrimitiveType) {
                 methodParams += if (ArtifactTypeService.isKotlin(it)) {
@@ -217,6 +215,22 @@ object JVMMarkerUtils {
         return "$methodName($methodParams)"
     }
 
+    /**
+     * Search imports for a fully qualified name that ends with the simple name of the type.
+     */
+    private fun findFullyQualifiedName(psiType: PsiType, psiFile: PsiFile): String? {
+        val simpleName = psiType.presentableText
+        val psiJavaFile = psiFile as? PsiJavaFile ?: return null
+        val importList = psiJavaFile.importList ?: return null
+        for (importStatement in importList.allImportStatements) {
+            val qualifiedName = importStatement.importReference?.qualifiedName
+            if (qualifiedName?.endsWith(".$simpleName") == true) {
+                return qualifiedName
+            }
+        }
+        return null
+    }
+
     //todo: better
     private fun getQualifiedName(method: KtNamedFunction): String {
         val methodName = method.nameIdentifier?.text ?: method.name ?: "unknown"