azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load annotations on properties declared in traits

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-16 21:49:27 +04:00
parent 5a1daaa4b6
commit b7789da3b9
21 changed files with 204 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization.java/src/java_descriptors.proto
+6 -2
View File
@@ -74,6 +74,10 @@ extend Callable {
optional JavaPropertySignature property_signature = 101;
// For top-level callables, short name of "...Package$src$..." class with the callable's body and annotations
optional int32 src_class_name = 102;
// Package-less name of the class with the callable's body and annotations, if it differs from the class it's serialized into.
// E.g. for a class "A/B/C$D" this would be "C$D".
// This is needed to find the class to load annotations from in the following cases:
// 1) annotations on top-level members are written to compiled package fragment classes
// 2) annotations on properties in traits are written to TImpl classes
optional int32 impl_class_name = 102;
}
core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
+3 -3
View File
@@ -9,7 +9,7 @@ public final class JavaProtoBuf {
com.google.protobuf.ExtensionRegistryLite registry) {
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.methodSignature);
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.propertySignature);
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.srcClassName);
registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.implClassName);
}
public interface JavaTypeOrBuilder
extends com.google.protobuf.MessageLiteOrBuilder {
@@ -2825,14 +2825,14 @@ public final class JavaProtoBuf {
null,
101,
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int SRC_CLASS_NAME_FIELD_NUMBER = 102;
public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
/**
* <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
java.lang.Integer> srcClassName = com.google.protobuf.GeneratedMessageLite
java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
0,