Minor: fix deprecations in Kotlin Android Extensions code

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

@@ -61,8 +61,8 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
     }
 
     private fun AndroidResourceManager.getModuleResDirectories(): List<VirtualFile> {
-        val info = androidModuleInfo
-        if (info == null) return listOf()
+        val info = androidModuleInfo ?: return listOf()
+
         val fileManager = VirtualFileManager.getInstance()
         return info.resDirectories.map { fileManager.findFileByUrl("file://" + it) }
     }

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

@@ -91,8 +91,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
             newName: String,
             allRenames: MutableMap<PsiElement, String>
     ) {
-        val module = jetProperty.getModule()
-        if (module == null) return
+        val module = jetProperty.getModule() ?: return
 
         val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
         val resourceManager = processor.resourceManager
@@ -119,8 +118,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
     ) {
         val element = LazyValueResourceElementWrapper.computeLazyElement(attribute)
         val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile(
-                attribute.getContainingFile().getVirtualFile(), attribute.getProject())
-        if (module == null) return
+                attribute.getContainingFile().getVirtualFile(), attribute.getProject()) ?: return
 
         val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
         if (element == null) return

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

@@ -26,10 +26,8 @@ import org.jetbrains.kotlin.lang.resolve.android.isAndroidSyntheticElement
 
 public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
     override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? {
-        val resolvedElement = reference.resolve()
-        if (resolvedElement == null) {
-            return null
-        }
+        val resolvedElement = reference.resolve() ?: return null
+
         if (isAndroidSyntheticElement(resolvedElement)) {
             if (element is ValueResourceElementWrapper) {
                 val resource = element.getValue()

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

@@ -30,7 +30,7 @@ public class IDEAndroidExternalDeclarationsProvider(private val project: Project
         if (moduleInfo !is ModuleSourceInfo) return listOf()
 
         val module = moduleInfo.module
-        val parser = ModuleServiceManager.getService<AndroidUIXmlProcessor>(module, javaClass<AndroidUIXmlProcessor>())
+        val parser = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
         val syntheticFiles = parser.parseToPsi()
         syntheticFiles?.forEach { it.moduleInfo = moduleInfo }
 

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

@@ -34,6 +34,7 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
         codeCompletionOldValue = settings.AUTOCOMPLETE_ON_CODE_COMPLETION
         smartTypeCompletionOldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION
 
+        @suppress("NON_EXHAUSTIVE_WHEN")
         when (completionType()) {
             CompletionType.SMART -> settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = false
             CompletionType.BASIC -> settings.AUTOCOMPLETE_ON_CODE_COMPLETION = false

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

@@ -37,8 +37,8 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
         val editor = f.getEditor()
         val file = f.getFile()
         val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file)
-        val element = TargetElementUtilBase.findTargetElement(completionEditor,
-                                                              TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)
+        val element = TargetElementUtilBase.findTargetElement(
+                completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)
 
         assert(element != null)
         assertTrue(element is JetProperty)