Introduced package view and fragment classes.

core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java

@@ -17,8 +17,13 @@
 package org.jetbrains.jet.lang.descriptors;
 
 public interface DeclarationDescriptorVisitor<R, D> {
+    @Deprecated
     R visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data);
 
+    R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data);
+
+    R visitPackageViewDescriptor(PackageViewDescriptor descriptor, D data);
+
     R visitVariableDescriptor(VariableDescriptor descriptor, D data);
 
     R visitFunctionDescriptor(FunctionDescriptor descriptor, D data);

core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java

@@ -21,6 +21,7 @@ import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorParent;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 
+@Deprecated
 public interface NamespaceDescriptor extends ClassOrNamespaceDescriptor, NamespaceDescriptorParent {
     @NotNull
     JetScope getMemberScope();

core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2013 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;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+
+public interface PackageFragmentDescriptor extends ClassOrNamespaceDescriptor {
+    @NotNull
+    @Override
+    ModuleDescriptor getContainingDeclaration();
+
+    @NotNull
+    FqName getFqName();
+
+    @NotNull
+    JetScope getMemberScope();
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageViewDescriptor.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2013 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;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+
+public interface PackageViewDescriptor extends DeclarationDescriptor {
+    @Override
+    @Nullable
+    PackageViewDescriptor getContainingDeclaration();
+
+    @NotNull
+    FqName getFqName();
+
+    @NotNull
+    JetScope getMemberScope();
+}

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

@@ -43,6 +43,16 @@ public class DeclarationDescriptorVisitorEmptyBodies<R, D> implements Declaratio
         return visitDeclarationDescriptor(descriptor, data);
     }
 
+    @Override
+    public R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data) {
+        return visitDeclarationDescriptor(descriptor, data);
+    }
+
+    @Override
+    public R visitPackageViewDescriptor(PackageViewDescriptor descriptor, D data) {
+        return visitDeclarationDescriptor(descriptor, data);
+    }
+
     @Override
     public R visitClassDescriptor(ClassDescriptor descriptor, D data) {
         return visitDeclarationDescriptor(descriptor, data);

core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -687,6 +687,18 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
         renderName(namespace, builder);
     }
 
+    private void renderPackageView(@NotNull PackageViewDescriptor packageView, @NotNull StringBuilder builder) {
+        builder.append(renderKeyword("package")).append(" ");
+        renderName(packageView, builder);
+    }
+
+    private void renderPackageFragment(@NotNull PackageFragmentDescriptor fragment, @NotNull StringBuilder builder) {
+        builder.append(renderKeyword("package-fragment")).append(" ");
+        renderName(fragment, builder);
+        builder.append(" in context of ");
+        renderName(fragment.getContainingDeclaration(), builder);
+    }
+
 
     /* STUPID DISPATCH-ONLY VISITOR */
     private class RenderDeclarationDescriptorVisitor extends DeclarationDescriptorVisitorEmptyBodies<Void, StringBuilder> {
@@ -737,6 +749,22 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
             return null;
         }
 
+        @Override
+        public Void visitPackageFragmentDescriptor(
+                PackageFragmentDescriptor descriptor, StringBuilder builder
+        ) {
+            renderPackageFragment(descriptor, builder);
+            return null;
+        }
+
+        @Override
+        public Void visitPackageViewDescriptor(
+                PackageViewDescriptor descriptor, StringBuilder builder
+        ) {
+            renderPackageView(descriptor, builder);
+            return null;
+        }
+
         @Override
         public Void visitModuleDeclaration(ModuleDescriptor descriptor, StringBuilder builder) {
             renderModuleOrScript(descriptor, builder);