From c3e900b945525e0d840da3ae8d05f25642f37493 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 3 Feb 2020 20:23:27 +0300
Subject: [PATCH] FIR: Make replace function accepting parameter with
 nullability as-is

---
 .../kotlin/fir/declarations/FirAnonymousFunction.kt         | 2 +-
 .../fir/declarations/impl/FirAnonymousFunctionImpl.kt       | 2 +-
 .../org/jetbrains/kotlin/fir/references/FirThisReference.kt | 2 +-
 .../kotlin/fir/references/impl/FirExplicitThisReference.kt  | 2 +-
 .../kotlin/fir/references/impl/FirImplicitThisReference.kt  | 2 +-
 .../jetbrains/kotlin/fir/tree/generator/printer/utils.kt    | 6 ++----
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt
index 5488482ab2d..82648ced8ea 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt
@@ -42,7 +42,7 @@ abstract class FirAnonymousFunction : FirPureAbstractElement(), FirFunction<FirA
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitAnonymousFunction(this, data)
 
-    abstract fun replaceInvocationKind(newInvocationKind: InvocationKind)
+    abstract fun replaceInvocationKind(newInvocationKind: InvocationKind?)
 
     abstract override fun <D> transformReturnTypeRef(transformer: FirTransformer<D>, data: D): FirAnonymousFunction
 
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt
index da878ac86eb..c0a15c9349b 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt
@@ -107,7 +107,7 @@ class FirAnonymousFunctionImpl(
         typeRef = newTypeRef
     }
 
-    override fun replaceInvocationKind(newInvocationKind: InvocationKind) {
+    override fun replaceInvocationKind(newInvocationKind: InvocationKind?) {
         invocationKind = newInvocationKind
     }
 }
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt
index 1ed06e49059..77b542a4571 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/FirThisReference.kt
@@ -21,5 +21,5 @@ abstract class FirThisReference : FirReference() {
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitThisReference(this, data)
 
-    abstract fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>)
+    abstract fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?)
 }
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt
index df19bd059a5..3c86bc1b531 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirExplicitThisReference.kt
@@ -27,7 +27,7 @@ class FirExplicitThisReference(
         return this
     }
 
-    override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>) {
+    override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?) {
         boundSymbol = newBoundSymbol
     }
 }
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt
index a78ef5d0ccd..fda1eca3f6a 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/references/impl/FirImplicitThisReference.kt
@@ -27,5 +27,5 @@ class FirImplicitThisReference(
         return this
     }
 
-    override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>) {}
+    override fun replaceBoundSymbol(newBoundSymbol: AbstractFirBasedSymbol<*>?) {}
 }
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt
index 7f26f91f2a7..ff375766336 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/utils.kt
@@ -67,7 +67,7 @@ fun transformFunctionDeclaration(transformName: String, returnType: String): Str
 
 fun Field.replaceFunctionDeclaration(): String {
     val capName = name.capitalize()
-    return "fun replace$capName(new$capName: $typeWithArgumentsWithoutNullablity)"
+    return "fun replace$capName(new$capName: $typeWithArguments)"
 }
 
 val Field.mutableType: String
@@ -107,8 +107,6 @@ val Importable.typeWithArguments: String
         else -> throw IllegalArgumentException()
     }
 
-val Importable.typeWithArgumentsWithoutNullablity: String get() = typeWithArguments.dropLastWhile { it == '?' }
-
 val ImplementationWithArg.generics: String
     get() = argument?.let { "<${it.type}>" } ?: ""
 
@@ -128,4 +126,4 @@ val Element.typeParameters: String
         ?: ""
 
 val Type.generics: String
-    get() = arguments.takeIf { it.isNotEmpty() }?.joinToString(",", "<", ">") ?: ""
\ No newline at end of file
+    get() = arguments.takeIf { it.isNotEmpty() }?.joinToString(",", "<", ">") ?: ""