FIR: rename FirResolvedImport.resolvedClassId|relativeClassName
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:
committed by
Ilya Kirillov
parent
e5b9d667c0
commit
211544e790
+2
-2
@@ -34,8 +34,8 @@ internal class KtFirNonStarImportingScope(
|
||||
imports.forEach { import ->
|
||||
NonStarImport(
|
||||
import.packageFqName,
|
||||
import.relativeClassName,
|
||||
import.resolvedClassId,
|
||||
import.relativeParentClassName,
|
||||
import.resolvedParentClassId,
|
||||
import.importedName
|
||||
).let(::add)
|
||||
}
|
||||
|
||||
+2
-2
@@ -42,8 +42,8 @@ internal class KtFirStarImportingScope(
|
||||
firScope.starImports.map { import ->
|
||||
StarImport(
|
||||
import.packageFqName,
|
||||
import.relativeClassName,
|
||||
import.resolvedClassId
|
||||
import.relativeParentClassName,
|
||||
import.resolvedParentClassId
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user