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

KTIJ-27730 [AA] Do not shorten constructors of nested classes by default

Browse Source 
The relevant tests are in the `intellij` repo

^KTIJ-27730 Fixed
This commit is contained in:
Roman Golyshev
2023-11-21 16:56:26 +01:00
committed by teamcity
parent 5729fab8c4
commit f5131d0be2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtReferenceShortener.kt
+8 -2
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analysis.api.components.ShortenStrategy.Companion.de
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol
import org.jetbrains.kotlin.kdoc.psi.impl.KDocName import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -86,8 +87,13 @@ public enum class ShortenStrategy {
} }
public val defaultCallableShortenStrategy: (KtCallableSymbol) -> ShortenStrategy = { symbol -> public val defaultCallableShortenStrategy: (KtCallableSymbol) -> ShortenStrategy = { symbol ->
if (symbol is KtEnumEntrySymbol) DO_NOT_SHORTEN if (symbol is KtEnumEntrySymbol) {
else SHORTEN_AND_IMPORT DO_NOT_SHORTEN
} else if (symbol is KtConstructorSymbol && symbol.containingClassIdIfNonLocal?.isNestedClass == true) {
SHORTEN_IF_ALREADY_IMPORTED
} else {
SHORTEN_AND_IMPORT
}
} }
} }
} }