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

FIR: Optimize fqName creation in ImportResolveTransformer

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-03-23 14:18:32 +03:00
committed by Mikhail Glukhikh
parent 8a5a43d670
commit 29ee4371d0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt
+6 -3
View File
@@ -31,7 +31,7 @@ class FirImportResolveTransformer : FirTransformer<Nothing?>() {
val firProvider = FirSymbolProvider.getInstance(import.session) val firProvider = FirSymbolProvider.getInstance(import.session)
if (!fqName.isRoot) { if (!fqName.isRoot) {
val lastPart = mutableListOf<String>() val lastPart = StringBuilder()
var firstPart = fqName var firstPart = fqName
if (import.isAllUnder && firProvider.getPackage(firstPart) != null) { if (import.isAllUnder && firProvider.getPackage(firstPart) != null) {
@@ -39,10 +39,13 @@ class FirImportResolveTransformer : FirTransformer<Nothing?>() {
} }
while (!firstPart.isRoot) { while (!firstPart.isRoot) {
lastPart.add(0, firstPart.shortName().asString()) if (lastPart.isNotEmpty())
lastPart.insert(0, '.')
lastPart.insert(0, firstPart.shortName().asString())
firstPart = firstPart.parent() firstPart = firstPart.parent()
val resolvedFqName = ClassId(firstPart, FqName.fromSegments(lastPart), false) val resolvedFqName = ClassId(firstPart, FqName(lastPart.toString()), false)
val foundSymbol = firProvider.getSymbolByFqName(resolvedFqName) val foundSymbol = firProvider.getSymbolByFqName(resolvedFqName)
if (foundSymbol != null) { if (foundSymbol != null) {