SAM constructors for type aliases.

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt

@@ -18,11 +18,14 @@ package org.jetbrains.kotlin.load.java.descriptors
 
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl
 import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude
 
-class SamConstructorDescriptor(
+interface SamConstructorDescriptor : SimpleFunctionDescriptor, SyntheticMemberDescriptor<JavaClassDescriptor>
+
+class SamConstructorDescriptorImpl(
         containingDeclaration: DeclarationDescriptor,
         private val samInterface: JavaClassDescriptor
 ) : SimpleFunctionDescriptorImpl(
@@ -32,7 +35,7 @@ class SamConstructorDescriptor(
         samInterface.name,
         CallableMemberDescriptor.Kind.SYNTHESIZED,
         samInterface.source
-), SyntheticMemberDescriptor<JavaClassDescriptor> {
+), SamConstructorDescriptor {
     override val baseDescriptorForSynthetic: JavaClassDescriptor
         get() = samInterface
 }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamTypeAliasConstructorDescriptor.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.load.java.descriptors
+
+import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
+import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
+import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl
+
+interface SamTypeAliasConstructorDescriptor : SamConstructorDescriptor {
+    val typeAliasDescriptor: TypeAliasDescriptor
+}
+
+class SamTypeAliasConstructorDescriptorImpl(
+        override val typeAliasDescriptor: TypeAliasDescriptor,
+        private val samInterfaceConstructorDescriptor: SamConstructorDescriptor
+) : SimpleFunctionDescriptorImpl(
+        typeAliasDescriptor.containingDeclaration,
+        null,
+        samInterfaceConstructorDescriptor.baseDescriptorForSynthetic.annotations,
+        samInterfaceConstructorDescriptor.baseDescriptorForSynthetic.name,
+        CallableMemberDescriptor.Kind.SYNTHESIZED,
+        typeAliasDescriptor.source
+), SamTypeAliasConstructorDescriptor {
+    override val baseDescriptorForSynthetic: JavaClassDescriptor
+        get() = samInterfaceConstructorDescriptor.baseDescriptorForSynthetic
+}