From da5f2a07840b3f54d2623a1aa5f2d3a2ae259359 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 21 Dec 2016 17:32:56 +0300
Subject: [PATCH] Always return identifier from handleElementRename()
 (KT-14358)

Returning reference will lead to replacing identifier with reference, that result bad psi, bad stubs, and failure at some point.

 #KT-14358 Fixed
---
 .../synthetic/idea/AndroidSimpleNameReferenceExtension.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
index c2a4d4d04f4..e15d34a1669 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
@@ -49,9 +49,9 @@ class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
         }
         else if (isLayoutPackageIdentifier(reference)) {
             return if (newElementName.endsWith(".xml"))
-                psiFactory.createSimpleName(newElementName.dropLast(".xml".length))
+                psiFactory.createSimpleName(newElementName.dropLast(".xml".length)).getIdentifier()
             else
-                reference.element
+                reference.element.getIdentifier()
         }
 
         return null