Support Android variants in IDE

plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/fqNameInAttr.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyBu<caret>

plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/fqNameInAttrFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyBu<caret>

plugins/android-idea-plugin/testData/android/completion/fqNameInTag/fqNameInTag.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyBu<caret>

plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/fqNameInTagFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyBu<caret>

plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt

@@ -1,8 +1,8 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
-import kotlinx.android.synthetic.layout1.*
+import kotlinx.android.synthetic.main.layout.*
+import kotlinx.android.synthetic.main.layout1.*
 
 class MyActivity: Activity() {
     val button = log<caret>

plugins/android-idea-plugin/testData/android/completion/multiFileFragment/multiFileFragment.kt

@@ -1,8 +1,8 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
-import kotlinx.android.synthetic.layout1.*
+import kotlinx.android.synthetic.main.layout.*
+import kotlinx.android.synthetic.main.layout1.*
 
 class MyFragment: Fragment() {
     val button = log<caret>

plugins/android-idea-plugin/testData/android/completion/propertiesSimple/propertiesSimple.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/propertiesSimpleFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/propertiesSimpleView.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.view.View
-import kotlinx.android.synthetic.layout.view.*
+import kotlinx.android.synthetic.main.layout.view.*
 
 fun View.a() {
     val button = this.login<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.login<caret>

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.login<caret>

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

@@ -3,7 +3,7 @@ package com.myapp
 import android.app.Activity
 import android.os.Bundle
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {}

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

@@ -2,7 +2,7 @@ package com.myapp
 
 import android.app.Fragment
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyFragemnt : Fragment() {
     override fun onResume() {}

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

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.view.View
-import kotlinx.android.synthetic.layout.view.*
+import kotlinx.android.synthetic.main.layout.view.*
 
 fun View.a() {
     val button = login<caret>

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

@@ -3,7 +3,7 @@ package com.myapp
 import android.app.Activity
 import android.os.Bundle
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {}

plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/fqNameInAttr.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/fqNameInAttrFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/goto/fqNameInTag/fqNameInTag.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/fqNameInTagFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/goto/multiFile/multiFile.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/goto/multiFileFragment/multiFileFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/goto/simple/simple.kt

@@ -3,7 +3,7 @@ package com.myapp
 import android.app.Activity
 import android.os.Bundle
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {}

plugins/android-idea-plugin/testData/android/goto/simpleFragment/simpleFragment.kt

@@ -2,7 +2,7 @@ package com.myapp
 
 import android.app.Fragment
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyFragment : Fragment() {
     override fun onResume() {}

plugins/android-idea-plugin/testData/android/goto/simpleView/simpleView.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.view.View
-import kotlinx.android.synthetic.layout.view.*
+import kotlinx.android.synthetic.main.layout.view.*
 
 fun View.a() {
     val button = login<caret>

plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/fqNameInAttr.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/fqNameInAttrFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/rename/fqNameInTag/fqNameInTag.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/fqNameInTagFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.MyButton<caret>

plugins/android-idea-plugin/testData/android/rename/multiFile/multiFile.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Activity
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyActivity: Activity() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/rename/multiFileFragment/multiFileFragment.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.app.Fragment
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 class MyFragment: Fragment() {
     val button = this.login<caret>

plugins/android-idea-plugin/testData/android/rename/simple/simple.kt

@@ -3,7 +3,7 @@ package com.myapp
 import android.app.Activity
 import android.os.Bundle
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {}

plugins/android-idea-plugin/testData/android/rename/simpleFragment/simpleFragment.kt

@@ -2,7 +2,7 @@ package com.myapp
 
 import android.app.Fragment
 import java.io.File
-import kotlinx.android.synthetic.layout.*
+import kotlinx.android.synthetic.main.layout.*
 
 public class MyFragment : Fragment() {
     override fun onResume() {}

plugins/android-idea-plugin/testData/android/rename/simpleView/simpleView.kt

@@ -1,7 +1,7 @@
 package com.myapp
 
 import android.view.View
-import kotlinx.android.synthetic.layout.view.*
+import kotlinx.android.synthetic.main.layout.view.*
 
 fun View.a() {
     val button = login<caret>