From dd083c64cc5dce0b990f582436f7cc709b0fabf9 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 23 Mar 2015 15:13:27 +0300 Subject: [PATCH] Simplify Module resolving in AndroidRenameProcessor --- .../kotlin/plugin/android/AndroidRenameProcessor.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt index 71df43a6303..7d737716a1b 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt @@ -66,15 +66,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() { private fun PsiElement.getModule(): Module? { val moduleInfo = getModuleInfo() - if (moduleInfo is ModuleSourceInfo) return moduleInfo.module - - val file = getContainingFile() as? JetFile - if (file != null) { - val moduleInfo = file.moduleInfo - if (moduleInfo is ModuleSourceInfo) return moduleInfo.module - } - - return null + return if (moduleInfo is ModuleSourceInfo) moduleInfo.module else null } override fun prepareRenaming(