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

Return updated element after reference shortening

Browse Source 
Fresh new expression obtained after qualified expression binding is
invalidated after shortening.
This commit is contained in:
Nikolay Krasko
2018-09-25 13:24:33 +03:00
parent c4283de9cb
commit 18c181641f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+10 -8
View File
@@ -178,16 +178,18 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
val needToShorten =
PsiTreeUtil.getParentOfType(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
if (needToShorten) {
when (shorteningMode) {
ShorteningMode.FORCED_SHORTENING -> ShortenReferences.DEFAULT.process(newQualifiedElement)
else -> newQualifiedElement.addToShorteningWaitSet()
}
val needToShorten = PsiTreeUtil.getParentOfType(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
if (!needToShorten) {
return newExpression
}
return newExpression
return when (shorteningMode) {
ShorteningMode.FORCED_SHORTENING -> ShortenReferences.DEFAULT.process(newQualifiedElement)
else -> {
newQualifiedElement.addToShorteningWaitSet()
newExpression
}
}
}
/**