Merge pull request #1 from feilfeilundfeil/master

Fix some problems

Author: Foso

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/common/ClassParser.kt

@@ -39,26 +39,31 @@ class ClassParser() {
         }
 
         private fun parseClassConstructor(descriptor: ClassDescriptor, processor: AbstractProcessor, round: RoundEnvironment, annotation: String) {
-            descriptor.constructors.forEach {
-                if (checkit(it, annotation)) {
-                    val annotatedConstructors = descriptor.constructors.filter { constructor -> constructor.hasAnnotation(annotation) }
+            try {
+                descriptor.constructors.forEach {
+                    if (checkit(it, annotation)) {
+                        val annotatedConstructors =
+                            descriptor.constructors.filter { constructor -> constructor.hasAnnotation(annotation) }
 
-                    annotatedConstructors.forEach { annotatedConstructor ->
+                        annotatedConstructors.forEach { annotatedConstructor ->
 
-                        val annotationDesc = annotatedConstructor.annotations.findAnnotation(annotation)
+                            val annotationDesc = annotatedConstructor.annotations.findAnnotation(annotation)
 
-                        round.module = descriptor.module
-                        round.elements.add(
+                            round.module = descriptor.module
+                            round.elements.add(
                                 Element.ClassConstructorElement(
-                                        classConstructorDescriptor = annotatedConstructor,
-                                        annotation = annotationDesc
+                                    classConstructorDescriptor = annotatedConstructor,
+                                    annotation = annotationDesc
 
                                 )
-                        )
-                        processor.process(round)
-                    }
+                            )
+                            processor.process(round)
+                        }
 
+                    }
                 }
+            } catch (e: Exception) {
+                println(e)
             }
 
         }

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/common/FunctionDescriptorExt.kt

@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
 import org.jetbrains.kotlin.resolve.source.getPsi
+import de.jensklingenberg.mpapt.model.Package
 
 
 /**
@@ -15,15 +16,23 @@ fun FunctionDescriptor.getFunctionParameters(): List<FunctionParameter> {
     //@de.ktorfit.POST public abstract suspend fun postPictures(helloWorld: sample.model.HelloWorld): kotlin.Unit defined in sample.data.Api[SimpleFunctionDescriptorImpl@470930f5]
 
     return if (valueParameters.isNotEmpty()) {
-        val list = this.toString().replace(" ", "").substringAfter("(").substringBefore(")").split(",")
-                .map {
-                    val split = it.split(":")
-                    FunctionParameter(
-                            split.first(),
-                            de.jensklingenberg.mpapt.model.Package(split[1].substringAfterLast("."), split[1].substringBeforeLast("."))
-                    )
-                }
-        list
+        this.valueParameters.map { parameter ->
+            // normal:
+            //value-parameter id: kotlin.Int defined in de.jensklingenberg.mpapt.CommonAnnotated.firstFunction2[ValueParameterDescriptorImpl@725a91a6]
+            // Typedefs:
+            //value-parameter id: de.jensklingenberg.mpapt.Datum /* = kotlin.ranges.CharProgression */ defined in de.jensklingenberg.mpapt.CommonAnnotated.firstFunction2[ValueParameterDescriptorImpl@692444bb]
+            val fullPackage = parameter.toString().substringAfter(": ")
+                .substringBefore(" defined")
+                .substringBefore(" /* =")
+            FunctionParameter(
+                parameter.name.asString(),
+                parameter.type.toString().endsWith("?"),
+                Package(
+                    fullPackage.split(".").last().replace("?", ""),
+                    fullPackage.split(".").dropLast(1).joinToString(".")
+                )
+            )
+        }.toList()
     } else {
         emptyList()
     }

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/SyntheticResolveExtensionImpl.kt

@@ -56,9 +56,6 @@ internal class SyntheticResolveExtensionImpl(val abstractProcessor: AbstractProc
     }
 
     override fun generateSyntheticProperties(thisDescriptor: ClassDescriptor, name: Name, bindingContext: BindingContext, fromSupertypes: ArrayList<PropertyDescriptor>, result: MutableSet<PropertyDescriptor>) {
-        val isLastClass = abstractProcessor.configuration.kotlinSourceRoots.last().path == (thisDescriptor.source as KotlinSourceElement).psi.containingKtFile.virtualFilePath
-        val isLastProperty = ((thisDescriptor.source as KotlinSourceElement).psi as KtClass).getProperties().last().equals(name)
-
 
         result.forEach {
             ClassParser.parseProperty(it, abstractProcessor, RoundEnvironment())

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/model/FunctionParameter.kt

@@ -1,5 +1,9 @@
 package de.jensklingenberg.mpapt.model
 
-data class FunctionParameter(val parameterName: String, val packagee: Package)
+data class FunctionParameter(
+    val parameterName: String,
+    val nullable: Boolean,
+    val packagee: Package
+)
 
-data class Package(val classname: String, val packagename: String)
+data class Package(val classname: String, val packagename: String)