Replaced usages of JetScope.getAllDescriptors() with JetScope.getDescriptors() (where makes sense)

idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt

@@ -56,8 +56,9 @@ public object TipsManager{
 
                 val qualifier = context[BindingContext.QUALIFIER, receiverExpression]
                 if (qualifier != null) {
+                    //TODO: filter out extensions!
                     // It's impossible to add extension function for package or class (if it's class object, expression type is not null)
-                    qualifier.scope.getAllDescriptors().filterTo(descriptors, ::filterIfInfix)
+                    qualifier.scope.getDescriptors(JetScope.DescriptorKind.NON_EXTENSIONS).filterTo(descriptors, ::filterIfInfix)
                 }
 
                 val expressionType = context[BindingContext.EXPRESSION_TYPE, receiverExpression]
@@ -66,7 +67,8 @@ public object TipsManager{
                     val dataFlowInfo = context.getDataFlowInfo(expression)
 
                     for (variant in SmartCastUtils.getSmartCastVariants(receiverValue, context, dataFlowInfo)) {
-                        variant.getMemberScope().getAllDescriptors().filterTo(descriptors) { filterIfInfix(it) && !it.isExtension }
+                        //TODO: filter out nested classes!
+                        variant.getMemberScope().getDescriptors().filterTo(descriptors) { filterIfInfix(it) && !it.isExtension }
                     }
 
                     JetScopeUtils.getAllExtensions(resolutionScope).filterTo(descriptors) {
@@ -79,16 +81,16 @@ public object TipsManager{
         }
 
         if (parent is JetImportDirective || parent is JetPackageDirective) {
-            return excludeNonPackageDescriptors(resolutionScope.getAllDescriptors())
+            return excludeNonPackageDescriptors(resolutionScope.getDescriptors({ it == JetScope.DescriptorKind.PACKAGE }))
         }
         else {
             val descriptorsSet = HashSet<DeclarationDescriptor>()
 
             for (receiverDescriptor in resolutionScope.getImplicitReceiversHierarchy()) {
-                receiverDescriptor.getType().getMemberScope().getAllDescriptors().filterTo(descriptorsSet) { !it.isExtension }
+                receiverDescriptor.getType().getMemberScope().getDescriptors().filterTo(descriptorsSet) { !it.isExtension }
             }
 
-            descriptorsSet.addAll(resolutionScope.getAllDescriptors())
+            descriptorsSet.addAll(resolutionScope.getDescriptors())
 
             descriptorsSet.excludeNotCallableExtensions(resolutionScope, context, context.getDataFlowInfo(expression))
 
@@ -98,7 +100,7 @@ public object TipsManager{
 
     public fun getPackageReferenceVariants(expression: JetSimpleNameExpression, context: BindingContext): Collection<DeclarationDescriptor> {
         val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf()
-        return excludeNonPackageDescriptors(resolutionScope.getAllDescriptors())
+        return excludeNonPackageDescriptors(resolutionScope.getDescriptors({ it == JetScope.DescriptorKind.PACKAGE }))
     }
 
     public fun excludeNotCallableExtensions(descriptors: Collection<DeclarationDescriptor>,

idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java

@@ -75,7 +75,7 @@ public abstract class BaseJetVariableMacro extends Macro {
                 new InjectorForMacros(project, resolveSession.getModuleDescriptor()).getExpressionTypingComponents();
 
         List<VariableDescriptor> filteredDescriptors = new ArrayList<VariableDescriptor>();
-        for (DeclarationDescriptor declarationDescriptor : scope.getAllDescriptors()) {
+        for (DeclarationDescriptor declarationDescriptor : scope.getDescriptors(JetScope.DescriptorKind.VARIABLES_AND_PROPERTIES, JetScope.ALL_NAME_FILTER)) {
             if (declarationDescriptor instanceof VariableDescriptor) {
                 VariableDescriptor variableDescriptor = (VariableDescriptor) declarationDescriptor;
                 if (isSuitable(variableDescriptor, scope, project, components)) {

idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java

@@ -96,7 +96,7 @@ public class JetAnonymousSuperMacro extends Macro {
 
         List<PsiNamedElement> result = new ArrayList<PsiNamedElement>();
 
-        for (DeclarationDescriptor descriptor : scope.getAllDescriptors()) {
+        for (DeclarationDescriptor descriptor : scope.getDescriptors(JetScope.DescriptorKind.CLASSIFIERS, JetScope.ALL_NAME_FILTER)) {
             if (!(descriptor instanceof ClassDescriptor)) continue;
             ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
             if (!classDescriptor.getModality().isOverridable()) continue;