Iniital implementation of synthetic extensions for SAM-adapter functions (non-static only)

2015-07-28 17:13:09 +03:00
parent 8b3870cc33
commit 729085ec9a
106 changed files with 624 additions and 364 deletions
@@ -83,7 +83,9 @@ public abstract class LazyJavaMemberScope(
        for (method in memberIndex().findMethodsByName(name)) {
            val descriptor = resolveMethodToFunctionDescriptor(method, true)
            result.add(descriptor)
-            result.addIfNotNull(c.samConversionResolver.resolveSamAdapter(descriptor))
+            if (method.isStatic) {
+                result.addIfNotNull(c.samConversionResolver.resolveSamAdapter(descriptor))
+            }
        }

        computeNonDeclaredFunctions(result, name)