Fix SAM adapters substitution

Approximate sourceFunction types if it's needed #KT-11696 Fixed
2016-03-31 11:14:42 +03:00
parent bc1b34a989
commit 1511a03027
4 changed files with 52 additions and 2 deletions
@@ -169,7 +169,10 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : SyntheticScope

            }

-            val sourceFunctionSubstitutor = TypeSubstitutor.create(substitutionMap)
+            val sourceFunctionSubstitutor =
+                    TypeConstructorSubstitution.createByConstructorsMap(
+                            substitutionMap, configuration.originalSubstitutor.substitution.approximateCapturedTypes()).buildSubstitutor()
+
            descriptor.sourceFunction = original.sourceFunction.substitute(sourceFunctionSubstitutor)

            return descriptor