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

Make handleElementRename overrides compatible with 183 platform

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-06 20:24:10 +03:00
parent d7317c58e9
commit 8231f5b259
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
+2 -2
View File
@@ -46,9 +46,9 @@ class KDocReference(element: KDocName): KtMultiReference<KDocName>(element) {
override fun resolve(): PsiElement? = multiResolve(false).firstOrNull()?.element
override fun handleElementRename(newElementName: String?): PsiElement? {
override fun handleElementRename(newElementName: String): PsiElement? {
val textRange = element.getNameTextRange()
val newText = textRange.replace(element.text, newElementName!!)
val newText = textRange.replace(element.text, newElementName)
val newLink = KDocElementFactory(element.project).createNameFromText(newText)
return element.replace(newLink)
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReference.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class KtArrayAccessReference(
override fun canRename() = true
override fun handleElementRename(newElementName: String?): PsiElement? {
override fun handleElementRename(newElementName: String): PsiElement? {
val arrayAccessExpression = expression
if (OperatorNameConventions.INVOKE.asString() == newElementName) {
val replacement = KtPsiFactory(arrayAccessExpression.project).buildExpression {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReference.kt
+1 -1
View File
@@ -39,7 +39,7 @@ class KtDestructuringDeclarationReference(element: KtDestructuringDeclarationEnt
return resolveToDescriptors(bindingContext).all { it is CallableMemberDescriptor && it.kind == CallableMemberDescriptor.Kind.SYNTHESIZED}
}
override fun handleElementRename(newElementName: String?): PsiElement? {
override fun handleElementRename(newElementName: String): PsiElement? {
if (canRename()) return expression
throw IncorrectOperationException()
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReference.kt
+1 -1
View File
@@ -94,7 +94,7 @@ class KtInvokeFunctionReference(expression: KtCallExpression) : KtSimpleReferenc
override fun canRename(): Boolean = true
override fun handleElementRename(newElementName: String?): PsiElement? {
override fun handleElementRename(newElementName: String): PsiElement? {
val callExpression = expression
val fullCallExpression = callExpression.getQualifiedExpressionForSelectorOrThis()
if (newElementName == OperatorNameConventions.GET.asString() && callExpression.typeArguments.isEmpty()) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+1 -1
View File
@@ -56,7 +56,7 @@ abstract class AbstractKtReference<T : KtElement>(element: T) : PsiPolyVariantRe
override fun getCanonicalText(): String = "<TBD>"
open fun canRename(): Boolean = false
override fun handleElementRename(newElementName: String?): PsiElement? = throw IncorrectOperationException()
override fun handleElementRename(newElementName: String): PsiElement? = throw IncorrectOperationException()
override fun bindToElement(element: PsiElement): PsiElement = throw IncorrectOperationException()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+1 -2
View File
@@ -100,9 +100,8 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
return true
}
override fun handleElementRename(newElementName: String?): PsiElement {
override fun handleElementRename(newElementName: String): PsiElement {
if (!canRename()) throw IncorrectOperationException()
if (newElementName == null) return expression
if (newElementName.unquote() == "") {
val qualifiedElement = expression.getQualifiedElement()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
+2 -2
View File
@@ -105,8 +105,8 @@ sealed class SyntheticPropertyAccessorReference(expression: KtNameReferenceExpre
}
}
override fun handleElementRename(newElementName: String?): PsiElement? {
if (!Name.isValidIdentifier(newElementName!!)) return expression
override fun handleElementRename(newElementName: String): PsiElement? {
if (!Name.isValidIdentifier(newElementName)) return expression
val newNameAsName = Name.identifier(newElementName)
val newName = if (getter) {