Merge "[conflict] Merge "Handle static methods in Plugins better." into main...

import javax.lang.model.element.Element

import javax.lang.model.element.ElementKind

import javax.lang.model.element.ExecutableElement

import javax.lang.model.element.Modifier

import javax.lang.model.element.PackageElement

import javax.lang.model.element.TypeElement

import javax.lang.model.type.TypeKind

                    // Method implementations

                    for (method in methods) {

                        val methodName = method.simpleName

                        if (methods.any { methodName.startsWith("${it.simpleName}\$") }) {

                            continue

                        }

                        val returnTypeName = method.returnType.toString()

                        val callArgs = StringBuilder()

                        var isFirst = true

                        val isStatic = method.modifiers.contains(Modifier.STATIC)

                        if (!isStatic) {

                            line("@Override")

                        }

                        parenBlock("public $returnTypeName $methodName") {

                            // While copying the method signature for the proxy type, we also

                            // accumulate arguments for the nested callsite.

                        }

                        val isVoid = method.returnType.kind == TypeKind.VOID

                        val nestedCall = "mInstance.$methodName($callArgs)"

                        val methodContainer = if (isStatic) sourceName else "mInstance"

                        val nestedCall = "$methodContainer.$methodName($callArgs)"

                        val callStatement =

                            when {

                                isVoid -> "$nestedCall;"