From 49d57124c1e6c1736d32d6f5c8cb21b7a897cd8e Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 21 Dec 2016 18:01:53 +0300
Subject: [PATCH] Take new name when layout rename started from reference

---
 .../synthetic/idea/AndroidSimpleNameReferenceExtension.kt    | 5 +----
 1 file changed, 1 insertion(+), 4 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 e15d34a1669..bb9fb4081a4 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
@@ -48,10 +48,7 @@ class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
             return psiFactory.createNameIdentifier(newSyntheticPropertyName.name)
         }
         else if (isLayoutPackageIdentifier(reference)) {
-            return if (newElementName.endsWith(".xml"))
-                psiFactory.createSimpleName(newElementName.dropLast(".xml".length)).getIdentifier()
-            else
-                reference.element.getIdentifier()
+            return psiFactory.createSimpleName(newElementName.substringBeforeLast(".xml")).getIdentifier()
         }
 
         return null
-- 
GitLab