Support Android variants in IDE

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

@@ -76,10 +76,10 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
 
             if (module != null) {
                 val resourceManager = AndroidLayoutXmlFileManager.getInstance(module) ?: return false
-                val resDirectories = resourceManager.getModuleResDirectories()
+                val resDirectories = resourceManager.getAllModuleResDirectories()
                 val baseDirectory = xmlFile.parent?.parent?.virtualFile
 
-                if (baseDirectory in resDirectories && xmlFile.isLayoutXmlFile()) {
+                if (baseDirectory != null && baseDirectory in resDirectories && xmlFile.isLayoutXmlFile()) {
                     return true
                 }
             }
@@ -95,11 +95,16 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
             }
         }
 
-        private fun AndroidLayoutXmlFileManager.getModuleResDirectories(): List<VirtualFile> {
+        private fun AndroidLayoutXmlFileManager.getAllModuleResDirectories(): List<VirtualFile> {
-            val info = androidModuleInfo ?: return listOf()
+            val module = androidModule ?: return listOf()
-
             val fileManager = VirtualFileManager.getInstance()
-            return info.resDirectories.map { fileManager.findFileByUrl("file://$it") }.filterNotNull()
+
+            return module.variants.fold(arrayListOf<VirtualFile>()) { list, variant ->
+                for (dir in variant.resDirectories) {
+                    fileManager.findFileByUrl("file://$dir")?.let { list += it }
+                }
+                list
+            }
         }
 
         private fun PsiFile.isLayoutXmlFile(): Boolean {

plugins/android-idea-plugin/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt

@@ -16,47 +16,69 @@
 
 package org.jetbrains.kotlin.android.synthetic.idea.res
 
+import com.android.builder.model.SourceProvider
 import com.intellij.openapi.module.Module
 import com.intellij.psi.PsiElement
 import org.jetbrains.android.facet.AndroidFacet
 import org.jetbrains.kotlin.android.synthetic.AndroidConst
 import org.jetbrains.kotlin.android.synthetic.idea.AndroidXmlVisitor
 import org.jetbrains.kotlin.android.synthetic.res.AndroidLayoutXmlFileManager
-import org.jetbrains.kotlin.android.synthetic.res.AndroidModuleInfo
+import org.jetbrains.kotlin.android.synthetic.res.AndroidModule
+import org.jetbrains.kotlin.android.synthetic.res.AndroidVariant
+import org.jetbrains.kotlin.android.synthetic.res.AndroidVariantData
 import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.android.synthetic.AndroidConst.SYNTHETIC_PACKAGE_PATH_LENGTH
 
 public class IDEAndroidLayoutXmlFileManager(val module: Module) : AndroidLayoutXmlFileManager(module.project) {
 
-    override val androidModuleInfo: AndroidModuleInfo? by lazy { module.androidFacet?.toAndroidModuleInfo() }
+    override val androidModule: AndroidModule? by lazy { module.androidFacet?.toAndroidModuleInfo() }
 
     override fun propertyToXmlAttributes(property: KtProperty): List<PsiElement> {
         val fqPath = property.fqName?.pathSegments() ?: return listOf()
-        if (fqPath.size() <= AndroidConst.SYNTHETIC_PACKAGE_PATH_LENGTH) return listOf()
+        if (fqPath.size <= SYNTHETIC_PACKAGE_PATH_LENGTH) return listOf()
 
-        val layoutPackageName = fqPath[AndroidConst.SYNTHETIC_PACKAGE_PATH_LENGTH].asString()
+        fun handle(variantData: AndroidVariantData, defaultVariant: Boolean = false): List<PsiElement>? {
-        val layoutFiles = getLayoutXmlFiles()[layoutPackageName]
+            val layoutNamePosition = SYNTHETIC_PACKAGE_PATH_LENGTH + (if (defaultVariant) 0 else 1)
-        if (layoutFiles == null || layoutFiles.isEmpty()) return listOf()
+            val layoutName = fqPath[layoutNamePosition].asString()
 
-        val propertyName = property.name
+            val layoutFiles = variantData[layoutName] ?: return null
+            if (layoutFiles.isEmpty()) return null
 
-        val attributes = arrayListOf<PsiElement>()
+            val propertyName = property.name
-        val visitor = AndroidXmlVisitor { retId, wClass, valueElement ->
+
-            if (retId == propertyName) attributes.add(valueElement)
+            val attributes = arrayListOf<PsiElement>()
+            val visitor = AndroidXmlVisitor { retId, wClass, valueElement ->
+                if (retId == propertyName) attributes.add(valueElement)
+            }
+
+            layoutFiles.forEach { it.accept(visitor) }
+            return attributes
         }
 
-        layoutFiles.forEach { it.accept(visitor) }
+        for (variantData in getLayoutXmlFiles()) {
-        return attributes
+            if (variantData.variant.isMainVariant && fqPath.size == SYNTHETIC_PACKAGE_PATH_LENGTH + 2) {
+                handle(variantData, true)?.let { return it }
+            }
+            else if (fqPath[SYNTHETIC_PACKAGE_PATH_LENGTH].asString() == variantData.variant.name) {
+                handle(variantData)?.let { return it }
+            }
+        }
+
+        return listOf()
     }
 
     private val Module.androidFacet: AndroidFacet?
         get() = AndroidFacet.getInstance(this)
 
-    private fun AndroidFacet.toAndroidModuleInfo(): AndroidModuleInfo? {
+    private fun SourceProvider.toVariant() = AndroidVariant(name, resDirectories.map { it.absolutePath })
-        val applicationPackage = manifest?.getPackage()?.toString()
+
-        val mainResDirectories = allResourceDirectories.map { it.path }
+    private fun AndroidFacet.toAndroidModuleInfo(): AndroidModule? {
+        val applicationPackage = manifest?.`package`?.toString()
 
         return if (applicationPackage != null) {
-            AndroidModuleInfo(applicationPackage, mainResDirectories)
+            val mainVariant = mainSourceProvider.toVariant()
+            val flavorVariants = flavorSourceProviders?.map { it.toVariant() } ?: listOf()
+            AndroidModule(applicationPackage, listOf(mainVariant) + flavorVariants)
         }
         else null
     }

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.main.layout.*
-import kotlinx.android.synthetic.layout1.*
+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.main.layout.*
-import kotlinx.android.synthetic.layout1.*
+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>

plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt

@@ -19,20 +19,21 @@ package org.jetbrains.kotlin.android
 import com.intellij.openapi.module.ModuleManager
 import org.jetbrains.kotlin.android.synthetic.idea.TestConst
 import org.jetbrains.kotlin.android.synthetic.idea.res.IDESyntheticFileGenerator
+import org.jetbrains.kotlin.android.synthetic.res.AndroidVariant
 import org.jetbrains.kotlin.android.synthetic.res.CliSyntheticFileGenerator
-import kotlin.test.assertEquals
 
 public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
-        val project = myFixture.getProject()
+        val project = myFixture.project
         project.putUserData(TestConst.TESTDATA_PATH, path)
         val resDirs = getResourceDirs(path).map {
             myFixture.copyDirectoryToProject(it.name, it.name)
             "$path${it.name}/"
         }
 
-        val cliParser = CliSyntheticFileGenerator(project, "$path../AndroidManifest.xml", resDirs)
+        val variants = listOf(AndroidVariant.createMainVariant(resDirs))
-        val ideParser = IDESyntheticFileGenerator(ModuleManager.getInstance(project).getModules()[0])
+        val cliParser = CliSyntheticFileGenerator(project, "$path../AndroidManifest.xml", variants)
+        val ideParser = IDESyntheticFileGenerator(ModuleManager.getInstance(project).modules[0])
 
         val cliResult = cliParser.getSyntheticFiles().joinToString("\n\n")
         val ideResult = ideParser.getSyntheticFiles().joinToString("\n\n")