From 7ae3eda37f8b26f18000ef393bd86cb188676d7a Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 23 Oct 2019 15:15:21 +0300 Subject: [PATCH] FIR: Rename FirResolvedRealCallableReference -> FirResolvedCallableReference ^KT-32725 In Progress --- .../FirCallCompletionResultsWriterTransformer.kt | 4 ++-- .../tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt | 6 +++--- ...bleReference.kt => FirResolvedCallableReference.kt} | 4 ++-- ...enceImpl.kt => FirResolvedCallableReferenceImpl.kt} | 8 ++++---- .../jetbrains/kotlin/fir/visitors/FirTransformer.kt | 10 +++++----- .../org/jetbrains/kotlin/fir/visitors/FirVisitor.kt | 4 ++-- .../jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt | 10 +++++----- .../kotlin/fir/tree/generator/FirTreeBuilder.kt | 2 +- .../fir/tree/generator/ImplementationConfigurator.kt | 2 +- .../kotlin/fir/tree/generator/NodeConfigurator.kt | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) rename compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/{FirResolvedRealCallableReference.kt => FirResolvedCallableReference.kt} (86%) rename compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/{FirResolvedRealCallableReferenceImpl.kt => FirResolvedCallableReferenceImpl.kt} (82%) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index 400586af72c..eba3aa28d25 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.copy import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.* +import org.jetbrains.kotlin.fir.references.impl.FirResolvedCallableReferenceImpl import org.jetbrains.kotlin.fir.references.impl.FirResolvedNamedReferenceImpl -import org.jetbrains.kotlin.fir.references.impl.FirResolvedRealCallableReferenceImpl import org.jetbrains.kotlin.fir.resolve.calls.Candidate import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate import org.jetbrains.kotlin.fir.resolve.calls.candidate @@ -78,7 +78,7 @@ class FirCallCompletionResultsWriterTransformer( return callableReferenceAccess.transformCalleeReference( StoreCalleeReference, - FirResolvedRealCallableReferenceImpl( + FirResolvedCallableReferenceImpl( calleeReference.psi, calleeReference.name, calleeReference.candidateSymbol diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 5e44f665c88..dae94eb1c7f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -818,7 +818,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { print(symbol.render()) - if (resolvedNamedReference is FirResolvedRealCallableReference) { + if (resolvedNamedReference is FirResolvedCallableReference) { if (resolvedNamedReference.inferredTypeArguments.isNotEmpty()) { print("<") @@ -844,8 +844,8 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { print("|") } - override fun visitResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference) { - visitResolvedRealCallableReference(resolvedRealCallableReference) + override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) { + visitResolvedNamedReference(resolvedCallableReference) } override fun visitThisReference(thisReference: FirThisReference) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedRealCallableReference.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt similarity index 86% rename from compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedRealCallableReference.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt index 97dd165348b..d5a01851f39 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedRealCallableReference.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt @@ -16,12 +16,12 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -abstract class FirResolvedRealCallableReference : FirResolvedNamedReference() { +abstract class FirResolvedCallableReference : FirResolvedNamedReference() { abstract override val psi: PsiElement? abstract override val name: Name abstract override val candidateSymbol: AbstractFirBasedSymbol<*>? abstract override val resolvedSymbol: AbstractFirBasedSymbol<*> abstract val inferredTypeArguments: List - override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvedRealCallableReference(this, data) + override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvedCallableReference(this, data) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedRealCallableReferenceImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt similarity index 82% rename from compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedRealCallableReferenceImpl.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt index 7cc27b9504e..49a9c48cf6b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedRealCallableReferenceImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.references.impl import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.references.FirResolvedRealCallableReference +import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.name.Name @@ -17,17 +17,17 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -class FirResolvedRealCallableReferenceImpl( +class FirResolvedCallableReferenceImpl( override val psi: PsiElement?, override val name: Name, override val resolvedSymbol: AbstractFirBasedSymbol<*> -) : FirResolvedRealCallableReference() { +) : FirResolvedCallableReference() { override val candidateSymbol: AbstractFirBasedSymbol<*>? get() = null override val inferredTypeArguments: MutableList = mutableListOf() override fun acceptChildren(visitor: FirVisitor, data: D) {} - override fun transformChildren(transformer: FirTransformer, data: D): FirResolvedRealCallableReferenceImpl { + override fun transformChildren(transformer: FirTransformer, data: D): FirResolvedCallableReferenceImpl { return this } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt index a65a9c399e5..1a38ff01feb 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt @@ -103,7 +103,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedRealCallableReference +import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirErrorTypeRef import org.jetbrains.kotlin.fir.types.FirDelegatedTypeRef @@ -512,8 +512,8 @@ abstract class FirTransformer : FirVisitor { - return transformElement(resolvedRealCallableReference, data) + open fun transformResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult { + return transformElement(resolvedCallableReference, data) } open fun transformResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: D): CompositeTransformResult { @@ -944,8 +944,8 @@ abstract class FirTransformer : FirVisitor { - return transformResolvedRealCallableReference(resolvedRealCallableReference, data) + final override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult { + return transformResolvedCallableReference(resolvedCallableReference, data) } final override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: D): CompositeTransformResult { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt index 1740f48bfaf..169690a9a1a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt @@ -103,7 +103,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedRealCallableReference +import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirErrorTypeRef import org.jetbrains.kotlin.fir.types.FirDelegatedTypeRef @@ -316,7 +316,7 @@ abstract class FirVisitor { open fun visitBackingFieldReference(backingFieldReference: FirBackingFieldReference, data: D): R = visitElement(backingFieldReference, data) - open fun visitResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference, data: D): R = visitElement(resolvedRealCallableReference, data) + open fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): R = visitElement(resolvedCallableReference, data) open fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: D): R = visitElement(resolvedTypeRef, data) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt index 5a4f6bb7fea..b34951a092b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt @@ -103,7 +103,7 @@ import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirDelegateFieldReference import org.jetbrains.kotlin.fir.references.FirBackingFieldReference -import org.jetbrains.kotlin.fir.references.FirResolvedRealCallableReference +import org.jetbrains.kotlin.fir.references.FirResolvedCallableReference import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirErrorTypeRef import org.jetbrains.kotlin.fir.types.FirDelegatedTypeRef @@ -510,8 +510,8 @@ abstract class FirVisitorVoid : FirVisitor() { visitElement(backingFieldReference) } - open fun visitResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference) { - visitElement(resolvedRealCallableReference) + open fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) { + visitElement(resolvedCallableReference) } open fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef) { @@ -942,8 +942,8 @@ abstract class FirVisitorVoid : FirVisitor() { visitBackingFieldReference(backingFieldReference) } - final override fun visitResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference, data: Nothing?) { - visitResolvedRealCallableReference(resolvedRealCallableReference) + final override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: Nothing?) { + visitResolvedCallableReference(resolvedCallableReference) } final override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: Nothing?) { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt index 34593139d94..04524507b7e 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt @@ -121,7 +121,7 @@ object FirTreeBuilder : AbstractFirTreeBuilder() { val delegateFieldReference = element("DelegateFieldReference", Reference, resolvedNamedReference) val backingFieldReference = element("BackingFieldReference", Reference, resolvedNamedReference) - val resolvedRealCallableReference = element("ResolvedRealCallableReference", Reference, resolvedNamedReference) + val resolvedCallableReference = element("ResolvedCallableReference", Reference, resolvedNamedReference) val resolvedTypeRef = element("ResolvedTypeRef", TypeRef, typeRef) val errorTypeRef = element("ErrorTypeRef", TypeRef, resolvedTypeRef) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index 149fd5347ae..718eee9e456 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -434,7 +434,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() defaultNull("candidateSymbol", withGetter = true) } - impl(resolvedRealCallableReference) { + impl(resolvedCallableReference) { defaultNull("candidateSymbol", withGetter = true) } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 08f99b688fa..cee931a6180 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -452,7 +452,7 @@ object NodeConfigurator : AbstractFieldConfigurator() { +field("resolvedSymbol", abstractFirBasedSymbolType, "*") } - resolvedRealCallableReference.configure { + resolvedCallableReference.configure { +fieldList("inferredTypeArguments", coneKotlinTypeType) }