From 62e583903e6a1c307f9f9cf21b361bc9adf01aa5 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 14 Nov 2016 18:10:27 +0300
Subject: [PATCH] Fix compilation gotoResourceHelper, KotlinAndroidTestCase

---
 .../kotlin/android/navigation/gotoResourceHelper.kt         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
index 8f475c3b7d3..a27e8a17d90 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
@@ -24,6 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.PsiClass
 import org.jetbrains.android.util.AndroidUtils
 import com.android.SdkConstants
+import com.intellij.openapi.module.ModuleUtil
 import org.jetbrains.android.augment.AndroidPsiElementFinder
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
@@ -67,6 +68,7 @@ private fun getReferredInfo(
     val firstPart = getReceiverAsSimpleNameExpression(middlePart) ?: return null
 
     val resolvedClass = firstPart.mainReference.resolve() as? PsiClass ?: return null
+    val resolvedModule = ModuleUtil.findModuleForPsiElement(resolvedClass)
 
     //the following code is copied from
     // org.jetbrains.android.util.AndroidResourceUtil.getReferredResourceOrManifestField
@@ -81,7 +83,7 @@ private fun getReferredInfo(
     val qName = resolvedClass.qualifiedName
 
     if (SdkConstants.CLASS_R == qName || AndroidPsiElementFinder.INTERNAL_R_CLASS_QNAME == qName) {
-        return AndroidResourceUtil.MyReferredResourceFieldInfo(resClassName, resFieldName, true, false)
+        return AndroidResourceUtil.MyReferredResourceFieldInfo(resClassName, resFieldName, resolvedModule, true, false)
     }
     val containingFile = resolvedClass.containingFile ?: return null
 
@@ -93,7 +95,7 @@ private fun getReferredInfo(
         return null
     }
 
-    return AndroidResourceUtil.MyReferredResourceFieldInfo(resClassName, resFieldName, false, fromManifest)
+    return AndroidResourceUtil.MyReferredResourceFieldInfo(resClassName, resFieldName, resolvedModule, false, fromManifest)
 }
 
 private fun getReceiverAsSimpleNameExpression(exp: KtSimpleNameExpression): KtSimpleNameExpression? {