Extracted SubpackagesScope.

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java

@@ -17,20 +17,15 @@
 package org.jetbrains.jet.lang.descriptors.impl;
 
 import com.google.common.collect.Lists;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.ChainedScope;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
-import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
-import org.jetbrains.jet.utils.Printer;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -53,7 +48,7 @@ public class PackageViewDescriptorImpl extends DeclarationDescriptorImpl impleme
         for (PackageFragmentDescriptor fragment : fragments) {
             scopes.add(fragment.getMemberScope());
         }
-        scopes.add(new SubpackagesScope());
+        scopes.add(new SubpackagesScope(this));
 
         memberScope = new ChainedScope(this, "package view scope for " + fqName + " in " + module.getName(),
                                        scopes.toArray(new JetScope[scopes.size()]));
@@ -113,39 +108,4 @@ public class PackageViewDescriptorImpl extends DeclarationDescriptorImpl impleme
         result = 31 * result + fqName.hashCode();
         return result;
     }
-
-    private class SubpackagesScope extends JetScopeImpl {
-        @NotNull
-        @Override
-        public DeclarationDescriptor getContainingDeclaration() {
-            return PackageViewDescriptorImpl.this;
-        }
-
-        @Nullable
-        @Override
-        public PackageViewDescriptor getPackage(@NotNull Name name) {
-            return name.isSpecial() ? null : module.getPackage(fqName.child(name));
-        }
-
-        @NotNull
-        @Override
-        public Collection<DeclarationDescriptor> getAllDescriptors() {
-            List<DeclarationDescriptor> result = Lists.newArrayList();
-            for (FqName subFqName : module.getPackageFragmentProvider().getSubPackagesOf(fqName)) {
-                ContainerUtil.addIfNotNull(result, getPackage(subFqName.shortName()));
-            }
-            return result;
-        }
-
-        @Override
-        public void printScopeStructure(@NotNull Printer p) {
-            p.println(getClass().getSimpleName(), " {");
-            p.pushIndent();
-
-            p.println("thisDescriptor = ", PackageViewDescriptorImpl.this);
-
-            p.popIndent();
-            p.println("}");
-        }
-    }
 }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.descriptors.impl;
+
+import com.google.common.collect.Lists;
+import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
+import org.jetbrains.jet.utils.Printer;
+
+import java.util.Collection;
+import java.util.List;
+
+public class SubpackagesScope extends JetScopeImpl {
+    private final PackageViewDescriptor packageView;
+
+    public SubpackagesScope(PackageViewDescriptor packageView) {
+        this.packageView = packageView;
+
+    }
+
+    @NotNull
+    @Override
+    public DeclarationDescriptor getContainingDeclaration() {
+        return packageView;
+    }
+
+    @Nullable
+    @Override
+    public PackageViewDescriptor getPackage(@NotNull Name name) {
+        return name.isSpecial() ? null : packageView.getModule().getPackage(packageView.getFqName().child(name));
+    }
+
+    @NotNull
+    @Override
+    public Collection<DeclarationDescriptor> getAllDescriptors() {
+        List<DeclarationDescriptor> result = Lists.newArrayList();
+        for (FqName subFqName : packageView.getModule().getPackageFragmentProvider().getSubPackagesOf(packageView.getFqName())) {
+            ContainerUtil.addIfNotNull(result, getPackage(subFqName.shortName()));
+        }
+        return result;
+    }
+
+    @Override
+    public void printScopeStructure(@NotNull Printer p) {
+        p.println(getClass().getSimpleName(), " {");
+        p.pushIndent();
+
+        p.println("thisDescriptor = ", packageView);
+
+        p.popIndent();
+        p.println("}");
+    }
+}