Allow to turn the first parameter of a SAM-converted lambda into the receiver (KT-12848)

compiler/frontend/src/org/jetbrains/kotlin/extensions/AnnotationBasedExtension.kt

@@ -24,9 +24,9 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.types.TypeUtils
 
 interface AnnotationBasedExtension {
-    fun getAnnotationFqNames(modifierListOwner: KtModifierListOwner): List<String>
+    fun getAnnotationFqNames(modifierListOwner: KtModifierListOwner?): List<String>
 
-    fun DeclarationDescriptor.hasSpecialAnnotation(modifierListOwner: KtModifierListOwner): Boolean {
+    fun DeclarationDescriptor.hasSpecialAnnotation(modifierListOwner: KtModifierListOwner?): Boolean {
         if (annotations.any { it.isASpecialAnnotation(modifierListOwner) }) return true
 
         if (this is ClassDescriptor) {
@@ -40,7 +40,7 @@ interface AnnotationBasedExtension {
     }
 
     private fun AnnotationDescriptor.isASpecialAnnotation(
-            modifierListOwner: KtModifierListOwner,
+            modifierListOwner: KtModifierListOwner?,
             allowMetaAnnotations: Boolean = true
     ): Boolean {
         val annotationType = type.constructor.declarationDescriptor ?: return false

compiler/frontend/src/org/jetbrains/kotlin/extensions/DeclarationAttributeAltererExtension.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.extensions
 
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 import org.jetbrains.kotlin.resolve.BindingContext
@@ -37,4 +38,6 @@ interface DeclarationAttributeAltererExtension {
             currentModality: Modality,
             bindingContext: BindingContext
     ): Modality? = null
+
+    fun shouldConvertFirstSAMParameterToReceiver(function: FunctionDescriptor) : Boolean = false
 }

compiler/frontend/src/org/jetbrains/kotlin/extensions/StorageComponentContainerContributor.kt

@@ -16,6 +16,8 @@
 
 package org.jetbrains.kotlin.extensions
 
+import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.resolve.TargetPlatform
 
@@ -24,5 +26,7 @@ interface StorageComponentContainerContributor {
             "org.jetbrains.kotlin.storageComponentContainerContributor", StorageComponentContainerContributor::class.java
     )
 
-    fun addDeclarations(container: StorageComponentContainer, platform: TargetPlatform)
+    fun addDeclarations(container: StorageComponentContainer, platform: TargetPlatform) {}
+
+    fun onContainerComposed(container: ComponentProvider, moduleInfo: ModuleInfo?) {}
 }

compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt

@@ -34,6 +34,9 @@ open class KotlinScriptDefinition(val template: KClass<out Any>) {
     // TODO: consider creating separate type (subtype? for kotlin scripts)
     open val fileType: LanguageFileType = KotlinFileType.INSTANCE
 
+    open val annotationsForSamWithReceivers: List<String>
+        get() = emptyList()
+
     open fun <TF> isScript(file: TF): Boolean =
             getFileName(file).endsWith(KotlinParserDefinition.STD_SCRIPT_EXT)