Fix WrongIdFormat exception on Android XML widgets with non-@+id/ format

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt

@@ -32,14 +32,12 @@ public object AndroidConst {
     val ID_USAGE_PREFIX = "@id/"
 }
 
-class WrongIdFormat(id: String) : Exception("Id \"$id\" has wrong format")
-
 public fun nameToIdDeclaration(name: String): String = AndroidConst.ID_DECLARATION_PREFIX + name
 
-public fun idToName(id: String): String {
+public fun idToName(id: String): String? {
     return if (isResourceIdDeclaration(id)) id.replace(AndroidConst.ID_DECLARATION_PREFIX, "")
     else if (isResourceIdUsage(id)) id.replace(AndroidConst.ID_USAGE_PREFIX, "")
-    else throw WrongIdFormat(id)
+    else null
 }
 
 public fun isResourceIdDeclaration(str: String?): Boolean = str?.startsWith(AndroidConst.ID_DECLARATION_PREFIX) ?: false

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt

@@ -37,7 +37,10 @@ class AndroidXmlHandler(
         val attributesMap = attributes.toMap()
         val idAttr = attributesMap[AndroidConst.ID_ATTRIBUTE_NO_NAMESPACE]
         val classNameAttr = attributesMap[AndroidConst.CLASS_ATTRIBUTE_NO_NAMESPACE] ?: localName
-        if (isResourceDeclarationOrUsage(idAttr)) elementCallback(idToName(idAttr), classNameAttr)
+        if (isResourceDeclarationOrUsage(idAttr)) {
+            val name = idToName(idAttr)
+            if (name != null) elementCallback(name, classNameAttr)
+        }
     }
 
     override fun endElement(uri: String?, localName: String, qName: String) {

plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt

@@ -129,7 +129,9 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
         if (element == null) return
         val oldPropName = AndroidResourceUtil.getResourceNameByReferenceText(attribute.getValue())
         val newPropName = idToName(newName)
-        renameSyntheticProperties(allRenames, newPropName, oldPropName, processor)
+        if (oldPropName != null && newPropName != null) {
+            renameSyntheticProperties(allRenames, newPropName, oldPropName, processor)
+        }
     }
 
     private fun renameSyntheticProperties(

plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt

@@ -45,7 +45,8 @@ class AndroidXmlVisitor(
             val attributeValue = attribute.getValue()
             if (attributeValue != null) {
                 val classNameAttr = tag?.getAttribute(AndroidConst.CLASS_ATTRIBUTE_NO_NAMESPACE)?.getValue() ?: tag?.getLocalName()
-                elementCallback(idToName(attributeValue), classNameAttr!!, attribute)
+                val name = idToName(attributeValue)
+                if (name != null) elementCallback(name, classNameAttr!!, attribute)
             }
         }
         tag?.acceptChildren(this)

plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/res/layout/layout.xml

@@ -0,0 +1,20 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:id="@+id/item_detail_container"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+    <Button
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign in" />
+
+</FrameLayout>

plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/wrongIdFormat.kt

@@ -0,0 +1,14 @@
+package com.myapp
+
+import android.app.Activity
+import android.os.Bundle
+import java.io.File
+import kotlinx.android.synthetic.layout.*
+
+public class MyActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {}
+    val button = login<caret>
+
+    fun f() = login.toString()
+}
+

plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java

@@ -59,4 +59,10 @@ public class AndroidFindUsagesTestGenerated extends AbstractAndroidFindUsagesTes
         String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simple/");
         doTest(fileName);
     }
+
+    @TestMetadata("wrongIdFormat")
+    public void testWrongIdFormat() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/");
+        doTest(fileName);
+    }
 }