From 52c6aebec27e2e3caf841c4c3c0182fe93402710 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 9 Oct 2020 10:39:00 +0300
Subject: [PATCH] FIR: Use copy-builders at FirObjectImportedCallableScope

---
 .../impl/FirObjectImportedCallableScope.kt    | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
index 090981949c0..b0143c4f190 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirObjectImportedCallableScope.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.fir.scopes.impl
 
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
-import org.jetbrains.kotlin.fir.declarations.builder.buildProperty
-import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
+import org.jetbrains.kotlin.fir.declarations.builder.buildPropertyCopy
+import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunctionCopy
 import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
@@ -30,19 +30,9 @@ class FirObjectImportedCallableScope(
                 return@wrapper
             }
             val function = symbol.fir
-            val syntheticFunction = buildSimpleFunction {
-                source = function.source
-                session = function.session
+            val syntheticFunction = buildSimpleFunctionCopy(function) {
                 origin = FirDeclarationOrigin.ImportedFromObject
-                returnTypeRef = function.returnTypeRef
-                receiverTypeRef = function.receiverTypeRef
-                this.name = function.name
-                status = function.status
                 this.symbol = FirNamedFunctionSymbol(CallableId(importedClassId, name), overriddenSymbol = symbol)
-                resolvePhase = function.resolvePhase
-                typeParameters.addAll(function.typeParameters)
-                valueParameters.addAll(function.valueParameters)
-                annotations.addAll(function.annotations)
             }
             processor(syntheticFunction.symbol)
         }
@@ -55,20 +45,9 @@ class FirObjectImportedCallableScope(
                 return@wrapper
             }
             val property = symbol.fir
-            val syntheticFunction = buildProperty {
-                source = property.source
-                session = property.session
+            val syntheticFunction = buildPropertyCopy(property) {
                 origin = FirDeclarationOrigin.ImportedFromObject
-                returnTypeRef = property.returnTypeRef
-                receiverTypeRef = property.receiverTypeRef
-                this.name = property.name
-                status = property.status
-                isVar = property.isVar
-                isLocal = property.isLocal
                 this.symbol = FirPropertySymbol(CallableId(importedClassId, name), overriddenSymbol = symbol)
-                resolvePhase = property.resolvePhase
-                typeParameters.addAll(property.typeParameters)
-                annotations.addAll(property.annotations)
             }
             processor(syntheticFunction.symbol)
         }
@@ -77,4 +56,4 @@ class FirObjectImportedCallableScope(
     override fun getCallableNames(): Set<Name> = objectUseSiteScope.getCallableNames()
 
     override fun getClassifierNames(): Set<Name> = emptySet()
-}
\ No newline at end of file
+}