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

FIR IDE: Refactor addElementToShorten functions

Browse Source
This commit is contained in:
Roman Golyshev
2021-02-09 18:44:03 +03:00
committed by Space
parent 09ba927680
commit d202b0feb2
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirReferenceShortener.kt
+7 -15
View File
@@ -242,7 +242,7 @@ private class ElementsToShortenCollector(private val shorteningContext: FirShort
} }
if (availableClassifier == null || availableClassifier.isFromStarOrPackageImport) { if (availableClassifier == null || availableClassifier.isFromStarOrPackageImport) {
addTypeToImportAndShorten(mostTopLevelClassId.asSingleFqName(), mostTopLevelTypeElement) addTypeToShorten(mostTopLevelTypeElement, mostTopLevelClassId.asSingleFqName())
} else { } else {
addFakePackagePrefixToShortenIfPresent(mostTopLevelTypeElement) addFakePackagePrefixToShortenIfPresent(mostTopLevelTypeElement)
} }
@@ -257,12 +257,8 @@ private class ElementsToShortenCollector(private val shorteningContext: FirShort
} }
} }
private fun addTypeToShorten(typeElement: KtUserType) { private fun addTypeToShorten(mostTopLevelTypeElement: KtUserType, classFqName: FqName? = null) {
typesToShorten.add(typeElement) namesToImport.addIfNotNull(classFqName)
}
private fun addTypeToImportAndShorten(classFqName: FqName, mostTopLevelTypeElement: KtUserType) {
namesToImport.add(classFqName)
typesToShorten.add(mostTopLevelTypeElement) typesToShorten.add(mostTopLevelTypeElement)
} }
@@ -300,7 +296,7 @@ private class ElementsToShortenCollector(private val shorteningContext: FirShort
} }
if (availableClassifier == null || availableClassifier.isFromStarOrPackageImport) { if (availableClassifier == null || availableClassifier.isFromStarOrPackageImport) {
addElementToImportAndShorten(mostTopLevelClassId.asSingleFqName(), mostTopLevelQualifier) addElementToShorten(mostTopLevelQualifier, mostTopLevelClassId.asSingleFqName())
} else { } else {
addFakePackagePrefixToShortenIfPresent(mostTopLevelQualifier) addFakePackagePrefixToShortenIfPresent(mostTopLevelQualifier)
} }
@@ -335,7 +331,7 @@ private class ElementsToShortenCollector(private val shorteningContext: FirShort
when { when {
availableCallables.isEmpty() -> { availableCallables.isEmpty() -> {
val additionalImport = callableId.asImportableFqName() ?: return val additionalImport = callableId.asImportableFqName() ?: return
addElementToImportAndShorten(additionalImport, qualifiedCallExpression) addElementToShorten(qualifiedCallExpression, additionalImport)
} }
availableCallables.all { it.callableId == callableId } -> { availableCallables.all { it.callableId == callableId } -> {
addElementToShorten(qualifiedCallExpression) addElementToShorten(qualifiedCallExpression)
@@ -396,12 +392,8 @@ private class ElementsToShortenCollector(private val shorteningContext: FirShort
} }
} }
private fun addElementToShorten(element: KtDotQualifiedExpression) { private fun addElementToShorten(element: KtDotQualifiedExpression, nameToImport: FqName? = null) {
qualifiersToShorten.add(element) namesToImport.addIfNotNull(nameToImport)
}
private fun addElementToImportAndShorten(nameToImport: FqName, element: KtDotQualifiedExpression) {
namesToImport.add(nameToImport)
qualifiersToShorten.add(element) qualifiersToShorten.add(element)
} }