From 3645dfc5afaebeb401b2a11733ef8f77d5d621f4 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 14 Apr 2015 19:07:35 +0300
Subject: [PATCH] Support several res/ directories

---
 .../src/AndroidComponentRegistrar.kt          | 13 ++++----
 .../resolve/android/AndroidResourceManager.kt | 11 ++++---
 .../android/CliAndroidResourceManager.kt      |  2 +-
 .../android/CliAndroidUIXmlProcessor.kt       |  4 +--
 .../lang/resolve/android/androidResources.kt  |  2 +-
 .../simple/severalResDirs/AndroidManifest.xml | 33 +++++++++++++++++++
 .../simple/severalResDirs/res/layout/test.xml | 15 +++++++++
 .../severalResDirs/res2/layout/test.xml       | 15 +++++++++
 .../simple/severalResDirs/test_LAYOUT.kt      | 32 ++++++++++++++++++
 .../simple/severalResDirs/test_VIEW.kt        | 23 +++++++++++++
 .../android/test/AbstractAndroidBoxTest.kt    |  4 +--
 .../test/AbstractAndroidBytecodeShapeTest.kt  |  4 +--
 .../AbstractAndroidXml2KConversionTest.kt     |  3 +-
 .../resolve/android/test/CompilerTestUtils.kt | 15 ++++++---
 .../AndroidPsiTreeChangePreprocessor.kt       |  2 +-
 .../android/IDEAndroidResourceManager.kt      |  4 +--
 .../android/AbstractAndroidCompletionTest.kt  |  8 ++---
 .../android/AbstractAndroidFindUsagesTest.kt  |  2 +-
 .../kotlin/android/AbstractAndroidGotoTest.kt |  2 +-
 .../android/AbstractAndroidRenameTest.kt      |  2 +-
 .../AbstractParserResultEqualityTest.kt       |  9 +++--
 .../kotlin/android/KotlinAndroidTestCase.java | 28 ++++++++--------
 22 files changed, 183 insertions(+), 50 deletions(-)
 create mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml
 create mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res/layout/test.xml
 create mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res2/layout/test.xml
 create mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt
 create mode 100644 plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt

diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
index f193efe4f4e..dd80d5eebe9 100644
--- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
@@ -34,11 +34,8 @@ import org.jetbrains.kotlin.lang.resolve.android.*
 import org.jetbrains.kotlin.psi.JetFile
 
 public object AndroidConfigurationKeys {
-
-    public val ANDROID_RES_PATH: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("android resources search path")
-
+    public val ANDROID_RES_PATH: CompilerConfigurationKey<List<String>> = CompilerConfigurationKey.create<List<String>>("android resources search path")
     public val ANDROID_MANIFEST: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("android manifest file")
-
     public val SUPPORT_V4: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("'true' if compiled with support-v4 library")
 }
 
@@ -46,7 +43,7 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
     companion object {
         public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
 
-        public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path")
+        public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path", allowMultipleOccurrences = true)
         public val MANIFEST_FILE_OPTION: CliOption = CliOption("androidManifest", "<path>", "Android manifest file")
         public val SUPPORT_V4_OPTION: CliOption = CliOption("supportV4", "<path>", "Support android-v4 library", required = false)
     }
@@ -57,7 +54,11 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
 
     override fun processOption(option: CliOption, value: String, configuration: CompilerConfiguration) {
         when (option) {
-            RESOURCE_PATH_OPTION -> configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, value)
+            RESOURCE_PATH_OPTION -> {
+                val paths = configuration.getList(AndroidConfigurationKeys.ANDROID_RES_PATH).toArrayList()
+                paths.add(value)
+                configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, paths)
+            }
             MANIFEST_FILE_OPTION -> configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, value)
             SUPPORT_V4_OPTION -> configuration.put(AndroidConfigurationKeys.SUPPORT_V4, value)
             else -> throw CliOptionProcessingException("Unknown option: ${option.name}")
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
index 103bb7a85c0..b51a50d4eef 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
@@ -55,8 +55,8 @@ public abstract class AndroidResourceManager(val project: Project) {
             return allChildren
         }
 
-        val resDirectory = fileManager.findFileByUrl("file://" + info.mainResDirectory)
-        val allChildren = resDirectory?.getAllChildren() ?: listOf()
+        val resDirectories = info.mainResDirectories.map { fileManager.findFileByUrl("file://$it") }
+        val allChildren = resDirectories.flatMap { it?.getAllChildren() ?: listOf() }
 
         return allChildren
                 .filter { it.getParent().getName().startsWith("layout") && it.getName().toLowerCase().endsWith(".xml") }
@@ -66,10 +66,11 @@ public abstract class AndroidResourceManager(val project: Project) {
                 .mapValues { it.getValue().sortBy { it.getParent().getName().length() } }
     }
 
-    fun getMainResDirectory(): VirtualFile? {
+    fun getModuleResDirectories(): List<VirtualFile> {
         val info = androidModuleInfo
-        if (info == null) return null
-        return VirtualFileManager.getInstance().findFileByUrl("file://" + info.mainResDirectory)
+        if (info == null) return listOf()
+        val fileManager = VirtualFileManager.getInstance()
+        return info.mainResDirectories.map { fileManager.findFileByUrl("file://" + it) }
     }
 
     companion object {
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt
index 66dbbfcef2e..6e2cef812f3 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidResourceManager.kt
@@ -28,7 +28,7 @@ import kotlin.properties.Delegates
 public class CliAndroidResourceManager(
         project: Project,
         private val manifestPath: String,
-        private val mainResDirectory: String
+        private val mainResDirectory: List<String>
 ) : AndroidResourceManager(project) {
 
     override val androidModuleInfo by Delegates.lazy {
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt
index c705d53244e..ba3b5953f7e 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/CliAndroidUIXmlProcessor.kt
@@ -30,11 +30,11 @@ import com.intellij.psi.util.CachedValueProvider.Result
 public class CliAndroidUIXmlProcessor(
         project: Project,
         private val manifestPath: String,
-        private val mainResDirectory: String
+        private val mainResDirectories: List<String>
 ) : AndroidUIXmlProcessor(project) {
 
     override val resourceManager: CliAndroidResourceManager by Delegates.lazy {
-        CliAndroidResourceManager(project, manifestPath, mainResDirectory)
+        CliAndroidResourceManager(project, manifestPath, mainResDirectories)
     }
 
     override val cachedSources: CachedValue<List<AndroidSyntheticFile>> by Delegates.lazy {
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt
index dfe0c8eb8d9..b4dcae9f025 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/androidResources.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.lang.resolve.android
 
-public data class AndroidModuleInfo(val applicationPackage: String, val mainResDirectory: String?)
+public data class AndroidModuleInfo(val applicationPackage: String, val mainResDirectories: List<String>)
 
 public abstract class AndroidResource(val id: String) {
     public abstract val className: String
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml
new file mode 100644
index 00000000000..580c474f5de
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.myapp"
+          android:versionCode="1"
+          android:versionName="1.0" >
+
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="18" />
+    <permission android:name="android"></permission>
+
+    <application
+            android:allowBackup="true"
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Sample" >
+        <activity
+                android:name="com.example.android.basiccontactables.MainActivity"
+                android:label="@string/app_name"
+                android:launchMode="singleTop">
+            <meta-data
+                    android:name="android.app.searchable"
+                    android:resource="@xml/searchable" />
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res/layout/test.xml
new file mode 100644
index 00000000000..f2376f5ddc7
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res/layout/test.xml
@@ -0,0 +1,15 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" >
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res2/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res2/layout/test.xml
new file mode 100644
index 00000000000..37de67d2e8d
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/res2/layout/test.xml
@@ -0,0 +1,15 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" >
+
+    <FrameLayout
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt
new file mode 100644
index 00000000000..29a9b39f74e
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt
@@ -0,0 +1,32 @@
+package kotlinx.android.synthetic.test
+
+import android.app.*
+import android.view.*
+import android.widget.*
+import android.webkit.*
+import android.inputmethodservice.*
+import android.opengl.*
+import android.appwidget.*
+import android.support.v4.app.*
+import android.support.v4.view.*
+import android.support.v4.widget.*
+import kotlin.internal.flexible.ft
+
+val android.app.Activity.button: ft<View, View?>
+    get() = findViewById(0)
+
+val android.app.Fragment.button: ft<View, View?>
+    get() = getView().findViewById(0)
+
+val android.app.Activity.button2: ft<Button, Button?>
+    get() = findViewById(0) as? Button
+
+val android.app.Fragment.button2: ft<Button, Button?>
+    get() = getView().findViewById(0) as? Button
+
+val android.app.Activity.button3: ft<Button, Button?>
+    get() = findViewById(0) as? Button
+
+val android.app.Fragment.button3: ft<Button, Button?>
+    get() = getView().findViewById(0) as? Button
+
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt
new file mode 100644
index 00000000000..ef488b44291
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt
@@ -0,0 +1,23 @@
+package kotlinx.android.synthetic.test.view
+
+import android.app.*
+import android.view.*
+import android.widget.*
+import android.webkit.*
+import android.inputmethodservice.*
+import android.opengl.*
+import android.appwidget.*
+import android.support.v4.app.*
+import android.support.v4.view.*
+import android.support.v4.widget.*
+import kotlin.internal.flexible.ft
+
+val android.view.View.button: ft<View, View?>
+    get() = findViewById(0)
+
+val android.view.View.button2: ft<Button, Button?>
+    get() = findViewById(0) as? Button
+
+val android.view.View.button3: ft<Button, Button?>
+    get() = findViewById(0) as? Button
+
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
index 1862f6a899f..491999bfb77 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt
@@ -41,10 +41,10 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
     }
 
     private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
-        val resPath = path + "layout/"
+        val layoutPaths = File(path).listFiles { it.name.startsWith("layout") && it.isDirectory() }!!.map { "$path${it.name}/" }
         val manifestPath = path + "AndroidManifest.xml"
         val supportV4 = File(path).name.startsWith("support")
-        myEnvironment = createAndroidTestEnvironment(configuration, resPath, manifestPath, supportV4)
+        myEnvironment = createAndroidTestEnvironment(configuration, layoutPaths, manifestPath, supportV4)
     }
 
     public fun doCompileAgainstAndroidSdkTest(path: String) {
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
index bc5c7994170..a175c3cffd2 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt
@@ -30,10 +30,10 @@ public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTes
     }
 
     private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
-        val resPath = path + "res/layout/"
+        val layoutPaths = getResPaths(path)
         val manifestPath = path + "../AndroidManifest.xml"
         val supportV4 = File(path).name.startsWith("support")
-        myEnvironment = createAndroidTestEnvironment(configuration, resPath, manifestPath, supportV4)
+        myEnvironment = createAndroidTestEnvironment(configuration, layoutPaths, manifestPath, supportV4)
     }
 
     public override fun doTest(path: String) {
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
index c1790e8f26b..df666fc3cdf 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
@@ -34,7 +34,8 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
         val testDirectory = File(path)
 
         val jetCoreEnvironment = getEnvironment()
-        val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.project, path + "AndroidManifest.xml", path + "/res")
+        val layoutPaths = getResPaths(path)
+        val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.project, path + "AndroidManifest.xml", layoutPaths)
         parser.supportV4 = testDirectory.name.startsWith("support")
 
         val actual = parser.parse(false).toMap { it.name }
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
index 8b610ba08d5..9af61fbf437 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt
@@ -30,15 +30,16 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.lang.resolve.android.CliAndroidUIXmlProcessor
+import java.io.File
 
 private class AndroidTestExternalDeclarationsProvider(
         val project: Project,
-        val resPath: String,
+        val resPaths: List<String>,
         val manifestPath: String,
         val supportV4: Boolean
 ) : ExternalDeclarationsProvider {
     override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
-        val parser = CliAndroidUIXmlProcessor(project, manifestPath, resPath)
+        val parser = CliAndroidUIXmlProcessor(project, manifestPath, resPaths)
         parser.supportV4 = supportV4
         return parser.parseToPsi() ?: listOf()
     }
@@ -46,15 +47,19 @@ private class AndroidTestExternalDeclarationsProvider(
 
 fun UsefulTestCase.createAndroidTestEnvironment(
         configuration: CompilerConfiguration,
-        resPath: String,
+        resPaths: List<String>,
         manifestPath: String,
         supportV4: Boolean
 ): KotlinCoreEnvironment {
-    configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, resPath)
+    configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, resPaths)
     configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, manifestPath)
     val myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     val project = myEnvironment.project
-    ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPath, manifestPath, supportV4))
+    ExternalDeclarationsProvider.registerExtension(project, AndroidTestExternalDeclarationsProvider(project, resPaths, manifestPath, supportV4))
     ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegenExtension())
     return myEnvironment
 }
+
+fun getResPaths(path: String): List<String> {
+    return File(path).listFiles { it.name.startsWith("res") && it.isDirectory() }!!.map { "$path${it.name}/" }
+}
\ No newline at end of file
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
index d487b007c70..53176e204df 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
@@ -46,7 +46,7 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
                 val module = projectFileIndex.getModuleForFile(file.getVirtualFile())
                 if (module != null) {
                     val resourceManager = AndroidResourceManager.getInstance(module)
-                    val mainResDirectory = resourceManager.getMainResDirectory()
+                    val mainResDirectory = resourceManager.getResDirectories()
                     val baseDirectory = file.getParent()?.getParent()?.getVirtualFile()
 
                     //File from res/ directory was modified
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt
index 7ac7bae1bd6..537ce8e26b5 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/IDEAndroidResourceManager.kt
@@ -54,10 +54,10 @@ public class IDEAndroidResourceManager(val module: Module) : AndroidResourceMana
 
     private fun AndroidFacet.toAndroidModuleInfo(): AndroidModuleInfo? {
         val applicationPackage = getManifest()?.getPackage()?.toString()
-        val mainResDirectory = getAllResourceDirectories().firstOrNull()?.getPath()
+        val mainResDirectories = getAllResourceDirectories().map { it.getPath() }
 
         return if (applicationPackage != null) {
-            AndroidModuleInfo(applicationPackage, mainResDirectory)
+            AndroidModuleInfo(applicationPackage, mainResDirectories)
         }
         else null
     }
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
index 40679f1c888..9e7a0ed2e88 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
@@ -44,11 +44,11 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
 
     private fun completionType() = CompletionType.BASIC
 
-    fun doTest(testPath: String?) {
-        myFixture.copyDirectoryToProject(getResDir()!!, "res")
-        val virtualFile = myFixture.copyFileToProject(testPath + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
+    fun doTest(path: String?) {
+        getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
+        val virtualFile = myFixture.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
         myFixture.configureFromExistingVirtualFile(virtualFile)
-        val fileText = FileUtil.loadFile(File(testPath + getTestName(true) + ".kt"), true)
+        val fileText = FileUtil.loadFile(File(path + getTestName(true) + ".kt"), true)
         testCompletion(fileText, TargetPlatform.JVM, {
             count -> myFixture.complete(completionType())
         })
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
index 37346ae6280..4634964b9ad 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidFindUsagesTest.kt
@@ -25,7 +25,7 @@ public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
 
     public fun doTest(path: String) {
         val f = myFixture!!
-        f.copyDirectoryToProject(getResDir()!!, "res")
+        getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
         val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
         f.configureFromExistingVirtualFile(virtualFile)
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
index f9edbcebeaf..eb56f4d2902 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidGotoTest.kt
@@ -27,7 +27,7 @@ public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
 
     public fun doTest(path: String) {
         val f = myFixture!!
-        f.copyDirectoryToProject(getResDir()!!, "res")
+        getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
         val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
         f.configureFromExistingVirtualFile(virtualFile)
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
index 0664776f470..d4e8c93a44c 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
@@ -30,7 +30,7 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
 
     public fun doTest(path: String) {
         val f = myFixture!!
-        f.copyDirectoryToProject(getResDir()!!, "res")
+        getResourceDirs(path).forEach { myFixture.copyDirectoryToProject(it.name, it.name) }
         val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
         f.configureFromExistingVirtualFile(virtualFile)
 
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
index 23087849e20..d2acdca5940 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractParserResultEqualityTest.kt
@@ -25,14 +25,19 @@ import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.JetTestUtils
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
+import java.io.File
 import kotlin.test.assertEquals
 
 public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
         val project = myFixture.getProject()
         project.putUserData(TestConst.TESTDATA_PATH, path)
-        myFixture.copyDirectoryToProject(getResDir(), "res")
-        val cliParser = CliAndroidUIXmlProcessor(project, path + "../AndroidManifest.xml", path + getResDir() + "/layout/")
+        val resDirs = getResourceDirs(path).map {
+            myFixture.copyDirectoryToProject(it.name, it.name)
+            "$path${it.name}/"
+        }
+
+        val cliParser = CliAndroidUIXmlProcessor(project, path + "../AndroidManifest.xml", resDirs)
         val ideParser = IDEAndroidUIXmlProcessor(ModuleManager.getInstance(project).getModules()[0])
 
         val cliResult = cliParser.parseToPsi()!!.joinToString("\n\n")
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
index 3be7856eed4..7173c386381 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
@@ -28,6 +28,7 @@ import com.intellij.facet.ModifiableFacetModel;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.startup.StartupManager;
@@ -38,7 +39,6 @@ import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.file.impl.FileManager;
 import com.intellij.testFramework.InspectionTestUtil;
-import com.intellij.testFramework.TestLogger;
 import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
 import com.intellij.testFramework.fixtures.*;
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
@@ -46,13 +46,13 @@ import com.intellij.testFramework.fixtures.impl.GlobalInspectionContextForTests;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.android.KotlinAndroidTestCaseBase;
 import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode;
 import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -77,9 +77,13 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
         this(true);
     }
 
-    @NotNull
-    protected String getResRelativePath() {
-        return "res/";
+    protected File[] getResourceDirs(String path) {
+        return new File(path).listFiles(new FileFilter() {
+            @Override
+            public boolean accept(@NotNull File file) {
+                return file.getName().startsWith("res") && file.isDirectory();
+            }
+        });
     }
 
     @Override
@@ -119,10 +123,12 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
 
         androidSdk = createAndroidSdk(getTestSdkPath(), getPlatformDir());
         myFacet = addAndroidFacet(myModule, sdkPath, getPlatformDir(), isToAddSdk());
-        if (new File(getResDir()).exists()) {
-            myFixture.copyDirectoryToProject(getResDir(), "res");
-        } else {
-            TestLogger.getInstance(this.getClass()).info("No res directory found in test");
+        for (File resDir : getResourceDirs(dirPath)) {
+            if (resDir.exists()) {
+                myFixture.copyDirectoryToProject(resDir.getName(), resDir.getName());
+            } else {
+                Logger.getInstance(this.getClass()).info("No res directory found in test");
+            }
         }
         myAdditionalModules = new ArrayList<Module>();
 
@@ -182,10 +188,6 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase {
         return "/additionalModules/" + moduleName;
     }
 
-    protected String getResDir() {
-        return "res";
-    }
-
     public static void tuneModule(JavaModuleFixtureBuilder moduleBuilder, String moduleDirPath) {
         moduleBuilder.addContentRoot(moduleDirPath);