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

FIR: rename FirResolvedImport.resolvedClassId|relativeClassName

Browse Source 
These two fields references the parent of the import rather than the
classes that are imported. For example

```
import java.util.Map // resolvedClassId -> null
import java.util.Map.Entry // resolvedClassId -> java.util.Map
import java.util.Map.* // resolvedClassId -> java.util.Map
import java.util.Map.someStaticMethod // resolvedClassId -> java.util.Map
import kotlin.package.someTopLevelFuntion // resolvedClassId -> null
import kotlin.package.MyObject.someObjectFuntion // resolvedClassId -> kotlin.package.MyObject
```
This commit is contained in:
Tianyu Geng
2021-08-20 12:47:41 -07:00
committed by Ilya Kirillov
parent e5b9d667c0
commit 211544e790
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+2 -2
View File
@@ -52,8 +52,8 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
delegate = "delegate"
}
default("resolvedClassId") {
delegate = "relativeClassName"
default("resolvedParentClassId") {
delegate = "relativeParentClassName"
delegateCall = "let { ClassId(packageFqName, it, false) }"
withGetter = true
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+2 -2
View File
@@ -431,8 +431,8 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
resolvedImport.configure {
+field("delegate", import)
+field("packageFqName", fqNameType)
+field("relativeClassName", fqNameType, nullable = true)
+field("resolvedClassId", classIdType, nullable = true)
+field("relativeParentClassName", fqNameType, nullable = true)
+field("resolvedParentClassId", classIdType, nullable = true)
+field(
"importedName",
nameType,