From 27d3ed76a054efeb33fbdba9c3ff030bc1671105 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <Yan.Zhulanow@jetbrains.com>
Date: Mon, 18 Sep 2017 18:05:49 +0300
Subject: [PATCH] Android Extensions: Support non-latin identifiers (KT-20299)

---
 .../kotlin/android/synthetic/AndroidConst.kt  |  3 +-
 .../nonLatinNames/res/layout/test.xml         | 24 ++++++++++++
 .../descriptors/nonLatinNames/result.txt      | 38 +++++++++++++++++++
 ...theticPropertyDescriptorTestGenerated.java |  6 +++
 4 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/res/layout/test.xml
 create mode 100644 plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/result.txt

diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
index 965f0ed05e0..9ca6a2ce5bb 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
@@ -32,7 +32,8 @@ object AndroidConst {
     val ID_ATTRIBUTE_NO_NAMESPACE: String = "id"
     val CLASS_ATTRIBUTE_NO_NAMESPACE: String = "class"
 
-    val IDENTIFIER_REGEX = "^@(\\+)?(([A-Za-z0-9_\\.]+)\\:)?id\\/([A-Za-z0-9_]+)$".toRegex()
+    private val IDENTIFIER_WORD_REGEX = "[(?:\\p{L}\\p{M}*)0-9_\\.]+"
+    val IDENTIFIER_REGEX = "^@(\\+)?(($IDENTIFIER_WORD_REGEX)\\:)?id\\/($IDENTIFIER_WORD_REGEX)$".toRegex()
 
     val CLEAR_FUNCTION_NAME = "clearFindViewByIdCache"
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/res/layout/test.xml
new file mode 100644
index 00000000000..f96908bd5cc
--- /dev/null
+++ b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/res/layout/test.xml
@@ -0,0 +1,24 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" >
+
+    <TextView
+        android:id="@+id/sonuç"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Enter your password" />
+
+    <EditText
+        android:id="@+id/привет"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPassword" />
+
+    <Button
+        android:id="@+id/こんにちは"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign in" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/result.txt
new file mode 100644
index 00000000000..9fa4e3b4c76
--- /dev/null
+++ b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/result.txt
@@ -0,0 +1,38 @@
+kotlinx
+
+
+kotlinx.android
+
+
+kotlinx.android.synthetic
+
+    public fun android.app.Activity.clearFindViewByIdCache(): kotlin.Unit
+    public fun android.app.Fragment.clearFindViewByIdCache(): kotlin.Unit
+    public fun android.view.View.clearFindViewByIdCache(): kotlin.Unit
+    public fun kotlinx.android.extensions.LayoutContainer.clearFindViewByIdCache(): kotlin.Unit
+
+
+kotlinx.android.synthetic.main
+
+
+kotlinx.android.synthetic.main.test
+
+    public val android.app.Activity.sonuç: android.widget.TextView!
+    public val android.app.Dialog.sonuç: android.widget.TextView!
+    public val android.app.Fragment.sonuç: android.widget.TextView!
+    public val kotlinx.android.extensions.LayoutContainer.sonuç: android.widget.TextView!
+    public val android.app.Activity.привет: android.widget.EditText!
+    public val android.app.Dialog.привет: android.widget.EditText!
+    public val android.app.Fragment.привет: android.widget.EditText!
+    public val kotlinx.android.extensions.LayoutContainer.привет: android.widget.EditText!
+    public val android.app.Activity.こんにちは: android.widget.Button!
+    public val android.app.Dialog.こんにちは: android.widget.Button!
+    public val android.app.Fragment.こんにちは: android.widget.Button!
+    public val kotlinx.android.extensions.LayoutContainer.こんにちは: android.widget.Button!
+
+
+kotlinx.android.synthetic.main.test.view
+
+    public val android.view.View.sonuç: android.widget.TextView!
+    public val android.view.View.привет: android.widget.EditText!
+    public val android.view.View.こんにちは: android.widget.Button!
\ No newline at end of file
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
index 6e0fafcfa50..c63989f8105 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java
@@ -72,6 +72,12 @@ public class AndroidSyntheticPropertyDescriptorTestGenerated extends AbstractAnd
         doTest(fileName);
     }
 
+    @TestMetadata("nonLatinNames")
+    public void testNonLatinNames() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/nonLatinNames/");
+        doTest(fileName);
+    }
+
     @TestMetadata("sameIds")
     public void testSameIds() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/");