From 9aa25f8af8df96abeac77bc454c18340e5ae2363 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 29 Sep 2017 14:27:42 +0300
Subject: [PATCH] Code cleanup: shadowed declarations filter

---
 .../idea/util/ShadowedDeclarationsFilter.kt   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
index e6f619c02b1..7f39da2367a 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
@@ -102,14 +102,13 @@ class ShadowedDeclarationsFilter(
         }
     }
 
-    private fun signature(descriptor: DeclarationDescriptor): Any {
-        return when (descriptor) {
-            is SimpleFunctionDescriptor -> FunctionSignature(descriptor)
-            is VariableDescriptor -> descriptor.name
-            is ClassDescriptor -> descriptor.importableFqName ?: descriptor
-            else -> descriptor
-        }
-    }
+    private fun signature(descriptor: DeclarationDescriptor): Any =
+            when (descriptor) {
+                is SimpleFunctionDescriptor -> FunctionSignature(descriptor)
+                is VariableDescriptor -> descriptor.name
+                is ClassDescriptor -> descriptor.importableFqName ?: descriptor
+                else -> descriptor
+            }
 
     private fun packageName(descriptor: DeclarationDescriptor) = descriptor.importableFqName?.parent()
 
@@ -122,7 +121,7 @@ class ShadowedDeclarationsFilter(
         val first = descriptors.first()
 
         if (first is ClassDescriptor) { // for classes with the same FQ-name we simply take the first one
-            return listOf<TDescriptor>(first)
+            return listOf(first)
         }
 
         val isFunction = first is FunctionDescriptor
@@ -203,7 +202,7 @@ class ShadowedDeclarationsFilter(
         val dataFlowInfo = bindingContext.getDataFlowInfoBefore(context)
         val context = BasicCallResolutionContext.create(bindingTrace, scope, newCall, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo,
                                                         ContextDependency.INDEPENDENT, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS,
-                                                        false, resolutionFacade.frontendService<LanguageVersionSettings>())
+                                                        false, /* languageVersionSettings */ resolutionFacade.frontendService())
         val callResolver = resolutionFacade.frontendService<CallResolver>()
         val results = if (isFunction) callResolver.resolveFunctionCall(context) else callResolver.resolveSimpleProperty(context)
         val resultingDescriptors = results.resultingCalls.map { it.resultingDescriptor }