Revert "Revert "Improve Kotlin Binding Support (#685)""

This reverts commit e3c55a9.

Author: mattleibow

Util/Xamarin.Kotlin.BindingSupport/build.cake

@@ -1,7 +1,7 @@
 
 var TARGET = Argument("t", Argument("target", "Default"));
 
-var PACKAGE_VERSION = "0.2.0-preview";
+var PACKAGE_VERSION = "0.3.0-preview";
 
 Task("externals")
 	.Does(() =>

Util/Xamarin.Kotlin.BindingSupport/native/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.41'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.0'
 }
 
 group 'xamarin.binding.kotlin'
@@ -17,8 +17,8 @@ dependencies {
     compile 'com.github.ajalt:clikt:2.1.0'
     compile 'xom:xom:1.3.2'
     compile 'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.41"
-    compile "org.jetbrains.kotlin:kotlin-reflect:1.3.41"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.0"
+    compile "org.jetbrains.kotlin:kotlin-reflect:1.3.0"
 }
 
 compileKotlin {

Util/Xamarin.Kotlin.BindingSupport/native/src/main/kotlin/xamarin/binding/kotlin/bindingsupport/ProcessXmlCommand.kt

@@ -20,6 +20,9 @@ class ProcessXmlCommand : CliktCommand(name = "KotlinBindingSupport") {
     val outputFile: File? by option("-o", "--output", help = "path to the output transform file")
         .file(fileOkay = true, folderOkay = false)
 
+    val ignoreFile: File? by option("-i", "--ignore", help = "path to the ignore file")
+        .file(fileOkay = true, folderOkay = false)
+
     val companions: Processor.CompanionProcessing by option("--companions", help = "indicate how to handle companions")
         .choice(
             "default" to Processor.CompanionProcessing.Default,
@@ -32,7 +35,7 @@ class ProcessXmlCommand : CliktCommand(name = "KotlinBindingSupport") {
         .flag(default = false)
 
     override fun run() {
-        val proc = Processor(xmlFile, jarFiles, outputFile)
+        val proc = Processor(xmlFile, jarFiles, outputFile, ignoreFile)
         proc.verbose = verbose
         proc.companions = companions
         proc.process()

Util/Xamarin.Kotlin.BindingSupport/native/src/main/kotlin/xamarin/binding/kotlin/bindingsupport/Processor.kt

@@ -10,14 +10,13 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Executable
 import java.lang.reflect.Field
 import java.lang.reflect.Method
-import java.net.URL
 import java.net.URLClassLoader
 import kotlin.reflect.KFunction
 import kotlin.reflect.KVisibility
 import kotlin.reflect.jvm.kotlinFunction
 import kotlin.reflect.jvm.kotlinProperty
 
-class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
+class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?, ignoreFile: File?) {
 
     private fun expressionClasses() =
         "/api/package/*[local-name()='class' or local-name()='interface']"
@@ -48,6 +47,8 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
     private val outputFile: File?
     private val xtransformsdoc: Document
 
+    private val ignored: List<String>
+
     init {
         val urls = jarFiles.map { file -> file.toURI().toURL() }
         loader = URLClassLoader(urls.toTypedArray())
@@ -57,6 +58,12 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
 
         xtransformsdoc = Document(Element("metadata"))
         this.outputFile = outputFile
+
+        if (ignoreFile != null) {
+            ignored = ignoreFile.readLines()
+        } else {
+            ignored = emptyList()
+        }
     }
 
     fun process() {
@@ -196,13 +203,13 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
 
         // remove the members that are not meant to be used
         processMembers(xclass, "constructor") {
-            shouldRemoveMember(it, jclass.declaredConstructors)
+            shouldRemoveMember(it, jclass.declaredConstructors + jclass.constructors)
         }
         processMembers(xclass, "method") {
-            shouldRemoveMember(it, jclass.declaredMethods)
+            shouldRemoveMember(it, jclass.declaredMethods + jclass.methods)
         }
         processMembers(xclass, "field") {
-            shouldRemoveField(it, jclass.declaredFields)
+            shouldRemoveField(it, jclass.declaredFields + jclass.fields)
         }
     }
 
@@ -253,6 +260,12 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
 
         logVerbose("Checking the class \"${xpackage}.${xname}\"...")
 
+        // make sure we haven't been told to ignore this
+        if (ignored.contains("${xpackage}.${xname}")) {
+            logVerbose("Ignoring class \"${xpackage}.${xname}\" because it was found in the ignore file...")
+            return ProcessResult.Ignore
+        }
+
         // before we check anything, make sure that the parent class is visible
         var lastPeriod = xname.lastIndexOf(".")
         while (lastPeriod != -1) {
@@ -319,6 +332,12 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
         val xtype = xmember.localName
         val xfullname = "${xpackage}.${xclassname}.${xname}"
 
+        // make sure we haven't been told to ignore this
+        if (ignored.contains(xfullname)) {
+            logVerbose("Ignoring member \"${xfullname}\" because it was found in the ignore file...")
+            return ProcessResult.Ignore
+        }
+
         // before doing any complex checks, make sure it is not an invalid member
         if (invalidKeywords.any { check -> check(xname) })
             return ProcessResult.RemoveGenerated
@@ -410,6 +429,12 @@ class Processor(xmlFile: File, jarFiles: List<File>, outputFile: File?) {
         val xtype = xmember.getAttributeValue("type")
         val xfullname = "${xpackage}.${xclassname}.${xname}"
 
+        // make sure we haven't been told to ignore this
+        if (ignored.contains(xfullname)) {
+            logVerbose("Ignoring field \"${xfullname}\" because it was found in the ignore file...")
+            return ProcessResult.Ignore
+        }
+
         // before doing any complex checks, make sure it is not an invalid member
         if (invalidKeywords.any { check -> check(xname) }) {
             return ProcessResult.RemoveGenerated
@@ -767,14 +792,14 @@ private val Element.parentElement: Element
 
 private val KmPackage.functionOverloads: List<Pair<KmFunction, List<KmValueParameter>>>
     get() = this.functions.map {
-        it to it.valueParameters.getOverloads()
+        it to it.valueParameters.getOverloads(it.receiverParameterType)
     }.flatMap { overload ->
         overload.second.map { params -> overload.first to params }
     }
 
 private val KmClass.functionOverloads: List<Pair<KmFunction, List<KmValueParameter>>>
     get() = this.functions.map {
-        it to it.valueParameters.getOverloads()
+        it to it.valueParameters.getOverloads(it.receiverParameterType)
     }.flatMap { overload ->
         overload.second.map { params -> overload.first to params }
     }
@@ -786,9 +811,15 @@ private val KmClass.constructorOverloads: List<Pair<KmConstructor, List<KmValueP
         overload.second.map { params -> overload.first to params }
     }
 
-private fun List<KmValueParameter>.getOverloads(): List<List<KmValueParameter>> {
+private fun List<KmValueParameter>.getOverloads(receiverParameterType: KmType? = null): List<List<KmValueParameter>> {
     val overloads = mutableListOf<List<KmValueParameter>>()
-    overloads.add(this)
+    if (receiverParameterType == null) {
+        overloads.add(this)
+    } else {
+        val t = KmValueParameter(0, "this")
+        t.type = receiverParameterType
+        overloads.add(listOf(t) + this)
+    }
     while (Flag.ValueParameter.DECLARES_DEFAULT_VALUE(overloads.last().lastOrNull()?.flags ?: 0)) {
         val l = overloads.last()
         overloads.add(l.take(l.size - 1))

Util/Xamarin.Kotlin.BindingSupport/source/Xamarin.Kotlin.BindingSupport.targets

@@ -9,21 +9,23 @@
     <PropertyGroup>
       <KotlinBindingSupportJar Condition="'$(KotlinBindingSupportJar)' == ''">$(MSBuildThisFileDirectory)binding-support-1.0.jar</KotlinBindingSupportJar>
       <KotlinBindingSupportExtraArgs Condition="'$(KotlinBindingSupportExtraArgs)' == ''"></KotlinBindingSupportExtraArgs>
+      <KotlinBindingSupportIgnorePath Condition="'$(KotlinBindingSupportIgnorePath)' == ''"></KotlinBindingSupportIgnorePath>
       <KotlinBindingSupportOutputPath Condition="'$(KotlinBindingSupportOutputPath)' == ''">$(IntermediateOutputPath)\KotlinBindingSupport.generated.xml</KotlinBindingSupportOutputPath>
     </PropertyGroup>
 
     <!-- private properties -->
     <PropertyGroup>
       <_KotlinBindingJavaPath Condition="'$(_KotlinBindingJavaPath)' == '' and '$(OS)' == 'Unix'">$(JavaSdkDirectory)\bin\java</_KotlinBindingJavaPath>
       <_KotlinBindingJavaPath Condition="'$(_KotlinBindingJavaPath)' == '' and '$(OS)' != 'Unix'">$(JavaSdkDirectory)\bin\java.exe</_KotlinBindingJavaPath>
+      <_KotlinBindingSupportIgnore Condition="'$(KotlinBindingSupportIgnorePath)' != ''">--ignore &quot;$(KotlinBindingSupportIgnorePath)&quot;</_KotlinBindingSupportIgnore>
     </PropertyGroup>
 
     <ItemGroup>
       <_KotlinBindingReferenceJar Include="@(EmbeddedJar);@(InputJar)" />
       <_KotlinBindingReferenceJar Include="@(EmbeddedReferenceJar);@(ReferenceJar);@(_AdditionalJavaLibraryReferences)" />
     </ItemGroup>
 
-    <Exec Command="&quot;$(_KotlinBindingJavaPath)&quot; -jar &quot;$(KotlinBindingSupportJar)&quot; --xml &quot;$(ApiOutputFile)&quot; --jar &quot;@(_KotlinBindingReferenceJar, '&quot; --jar &quot;')&quot; --output &quot;$(KotlinBindingSupportOutputPath)&quot; $(KotlinBindingSupportExtraArgs)" />
+    <Exec Command="&quot;$(_KotlinBindingJavaPath)&quot; -jar &quot;$(KotlinBindingSupportJar)&quot; --xml &quot;$(ApiOutputFile)&quot; --jar &quot;@(_KotlinBindingReferenceJar, '&quot; --jar &quot;')&quot; --output &quot;$(KotlinBindingSupportOutputPath)&quot; $(_KotlinBindingSupportIgnore) $(KotlinBindingSupportExtraArgs)" />
 
     <ItemGroup>
       <!-- insert the generated transform at the beginning -->