Cleanup: apply "lift out..." inspection (+ some others)

2017-06-28 14:30:52 +03:00
parent 0c41ceea9d
commit 9c06739594
52 changed files with 294 additions and 311 deletions
@@ -86,11 +86,11 @@ internal fun JavaPropertyDescriptor.getResourceReferenceType(): AndroidPsiUtils.
    val rClass = containingClass.containingDeclaration as? JavaClassDescriptor ?: return NONE

    if (R_CLASS == rClass.name.asString()) {
-        if ((rClass.containingDeclaration as? PackageFragmentDescriptor)?.fqName?.asString() == ANDROID_PKG) {
-            return FRAMEWORK
+        return if ((rClass.containingDeclaration as? PackageFragmentDescriptor)?.fqName?.asString() == ANDROID_PKG) {
+            FRAMEWORK
        }
        else {
-            return APP
+            APP
        }
    }