From 56cc40f639fd10cff1907a22d0b50457d519aaa7 Mon Sep 17 00:00:00 2001
From: Mark Punzalan <markpun@google.com>
Date: Fri, 1 Oct 2021 07:03:03 +0000
Subject: [PATCH] FIR: Rename SAM constructor parameter name from "block" to
 "function".

This matches FE 1.0 (see
core/descriptors/src/org/jetbrains/kotlin/resolve/sam/samConstructorUtils.kt).
---
 .../analysisSession/resolveCall/samConstructorCall.txt        | 4 ++--
 .../analysis-api/testData/referenceResolve/SamConstructor.txt | 2 +-
 .../testData/referenceResolve/SamConstructorTypeArguments.txt | 2 +-
 .../testData/symbols/symbolByReference/samConstructor.txt     | 2 +-
 .../src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt
index fa2bca6abb8..b565dc1c2c0 100644
--- a/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt
+++ b/analysis/analysis-api/testData/analysisSession/resolveCall/samConstructorCall.txt
@@ -1,4 +1,4 @@
 KtFunctionCall:
-argumentMapping = { {x: Int, y: Int -> 1} -> (block: kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>) }
-targetFunction = java/util/Comparator(block: kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>): java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+argumentMapping = { {x: Int, y: Int -> 1} -> (function: kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>) }
+targetFunction = java/util/Comparator(function: kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>): java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
 substitutor = <map substitutor: {FirTypeParameterSymbol T=ft<kotlin/Int, kotlin/Int?>}>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt
index 6ffab238f17..61802301b14 100644
--- a/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt
+++ b/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(block: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) fun <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt
index 6ffab238f17..61802301b14 100644
--- a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt
+++ b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt
@@ -1,2 +1,2 @@
 Resolved to:
-0: (in java.util) fun <T : kotlin.Any!> Comparator(block: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
+0: (in java.util) fun <T : kotlin.Any!> Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator<T>
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt
index 46968b3a015..aefc917de6a 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt
@@ -8,6 +8,6 @@ KtFirSamConstructorSymbol:
   receiverType: null
   symbolKind: SAM_CONSTRUCTOR
   valueParameters: [
-    KtFirValueParameterSymbol(block)
+    KtFirValueParameterSymbol(function)
   ]
   deprecationStatus: null
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
index 54bbafc860e..d21c9104384 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
@@ -40,7 +40,7 @@ abstract class FirSamResolver {
     abstract fun getSamConstructor(firRegularClass: FirRegularClass): FirSimpleFunction?
 }
 
-private val SAM_PARAMETER_NAME = Name.identifier("block")
+private val SAM_PARAMETER_NAME = Name.identifier("function")
 
 class FirSamResolverImpl(
     private val session: FirSession,