From b47982a0a687dd5d4dea86ba0dee4aa5bb63abbe Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 5 Oct 2015 00:38:14 +0300
Subject: [PATCH] Write new protobuf messages for packages as well as classes

An addition to ad735cd
---
 .../kotlin/serialization/DescriptorSerializer.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index c3b07648746..e15066eee98 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
@@ -580,6 +580,13 @@ public class DescriptorSerializer {
             if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
                 builder.addMember(callableProto((CallableMemberDescriptor) declaration));
             }
+
+            if (declaration instanceof PropertyDescriptor) {
+                builder.addProperty(propertyProto((PropertyDescriptor) declaration));
+            }
+            else if (declaration instanceof FunctionDescriptor) {
+                builder.addFunction(functionProto((FunctionDescriptor) declaration));
+            }
         }
 
         extension.serializePackage(fragments, builder);
@@ -595,6 +602,13 @@ public class DescriptorSerializer {
             if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
                 builder.addMember(callableProto((CallableMemberDescriptor) declaration));
             }
+
+            if (declaration instanceof PropertyDescriptor) {
+                builder.addProperty(propertyProto((PropertyDescriptor) declaration));
+            }
+            else if (declaration instanceof FunctionDescriptor) {
+                builder.addFunction(functionProto((FunctionDescriptor) declaration));
+            }
         }
 
         return builder;