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

More diagnostic for EA-75975

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-03-01 12:41:37 +03:00
parent 135ec78d7d
commit 508e1937d6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+7 -3
View File
@@ -153,7 +153,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
if (expression !is KtNameReferenceExpression) return expression if (expression !is KtNameReferenceExpression) return expression
if (expression.parent is KtThisExpression || expression.parent is KtSuperExpression) return expression // TODO: it's a bad design of PSI tree, we should change it if (expression.parent is KtThisExpression || expression.parent is KtSuperExpression) return expression // TODO: it's a bad design of PSI tree, we should change it
val newExpression = expression.changeQualifiedName(fqName).getQualifiedElementSelector() as KtNameReferenceExpression val newExpression = expression.changeQualifiedName(fqName)
val newQualifiedElement = newExpression.getQualifiedElement() val newQualifiedElement = newExpression.getQualifiedElement()
if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
@@ -177,7 +177,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
* Result is either the same as original element, or [[KtQualifiedExpression]], or [[KtUserType]] * Result is either the same as original element, or [[KtQualifiedExpression]], or [[KtUserType]]
* Note that FqName may not be empty * Note that FqName may not be empty
*/ */
private fun KtNameReferenceExpression.changeQualifiedName(fqName: FqName): KtElement { private fun KtNameReferenceExpression.changeQualifiedName(fqName: FqName): KtNameReferenceExpression {
assert(!fqName.isRoot) { "Can't set empty FqName for element $this" } assert(!fqName.isRoot) { "Can't set empty FqName for element $this" }
val shortName = fqName.shortName().render() val shortName = fqName.shortName().render()
@@ -190,13 +190,17 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
val text = if (!fqName.isOneSegmentFQN()) "${fqName.parent().render()}.$fqNameBase" else fqNameBase val text = if (!fqName.isOneSegmentFQN()) "${fqName.parent().render()}.$fqNameBase" else fqNameBase
val elementToReplace = getQualifiedElement() val elementToReplace = getQualifiedElement()
return when (elementToReplace) {
val newElement = when (elementToReplace) {
is KtUserType -> { is KtUserType -> {
val typeText = "$text${elementToReplace.typeArgumentList?.text ?: ""}" val typeText = "$text${elementToReplace.typeArgumentList?.text ?: ""}"
elementToReplace.replace(psiFactory.createType(typeText).typeElement!!) elementToReplace.replace(psiFactory.createType(typeText).typeElement!!)
} }
else -> elementToReplace.replace(psiFactory.createExpression(text)) else -> elementToReplace.replace(psiFactory.createExpression(text))
} as KtElement } as KtElement
val selector = newElement.getQualifiedElementSelector() ?: error("No selector for $newElement")
return selector as KtNameReferenceExpression
} }
override fun getCanonicalText(): String = expression.text override fun getCanonicalText(): String = expression.text