azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: Rename FirResolvedRealCallableReference -> FirResolvedCallableReference

Browse Source 
^KT-32725 In Progress
This commit is contained in:
Denis Zharkov
2019-10-23 15:15:21 +03:00
parent 1564e72b59
commit 7ae3eda37f
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
+2 -2
View File
@@ -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
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+3 -3
View File
@@ -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) {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedRealCallableReference.kt → compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/FirResolvedCallableReference.kt
+2 -2
View File
@@ -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<ConeKotlinType>
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitResolvedRealCallableReference(this, data)
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitResolvedCallableReference(this, data)
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedRealCallableReferenceImpl.kt → compiler/fir/tree/src/org/jetbrains/kotlin/fir/references/impl/FirResolvedCallableReferenceImpl.kt
+4 -4
View File
@@ -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<ConeKotlinType> = mutableListOf()
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {}
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirResolvedRealCallableReferenceImpl {
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirResolvedCallableReferenceImpl {
return this
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt
+5 -5
View File
@@ -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<in D> : FirVisitor<CompositeTransformResult<FirEle
return transformElement(backingFieldReference, data)
}
open fun transformResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference, data: D): CompositeTransformResult<FirReference> {
return transformElement(resolvedRealCallableReference, data)
open fun transformResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult<FirReference> {
return transformElement(resolvedCallableReference, data)
}
open fun transformResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: D): CompositeTransformResult<FirTypeRef> {
@@ -944,8 +944,8 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
return transformBackingFieldReference(backingFieldReference, data)
}
final override fun visitResolvedRealCallableReference(resolvedRealCallableReference: FirResolvedRealCallableReference, data: D): CompositeTransformResult<FirReference> {
return transformResolvedRealCallableReference(resolvedRealCallableReference, data)
final override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference, data: D): CompositeTransformResult<FirReference> {
return transformResolvedCallableReference(resolvedCallableReference, data)
}
final override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef, data: D): CompositeTransformResult<FirTypeRef> {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt
+2 -2
View File
@@ -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<out R, in D> {
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)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt
+5 -5
View File
@@ -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<Unit, Nothing?>() {
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<Unit, Nothing?>() {
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?) {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt
+1 -1
View File
@@ -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)
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+1 -1
View File
@@ -434,7 +434,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
defaultNull("candidateSymbol", withGetter = true)
}
impl(resolvedRealCallableReference) {
impl(resolvedCallableReference) {
defaultNull("candidateSymbol", withGetter = true)
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+1 -1
View File
@@ -452,7 +452,7 @@ object NodeConfigurator : AbstractFieldConfigurator() {
+field("resolvedSymbol", abstractFirBasedSymbolType, "*")
}
resolvedRealCallableReference.configure {
resolvedCallableReference.configure {
+fieldList("inferredTypeArguments", coneKotlinTypeType)
}