Drop Callable and primary/secondary constructor proto messages
This commit is contained in:
Alexander Udalov
@@ -58,7 +58,11 @@ public class KotlinClassAnnotationTest extends CodegenTestCase {
|
||||
assertNotNull(strings);
|
||||
ClassData classData = JvmProtoBufUtil.readClassDataFrom(data, strings);
|
||||
|
||||
Set<String> callableNames = collectCallableNames(classData.getClassProto().getMemberList(), classData.getNameResolver());
|
||||
Set<String> callableNames = collectCallableNames(
|
||||
classData.getClassProto().getFunctionList(),
|
||||
classData.getClassProto().getPropertyList(),
|
||||
classData.getNameResolver()
|
||||
);
|
||||
assertSameElements(Arrays.asList("foo", "bar"), callableNames);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,11 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
|
||||
assertNotNull(strings);
|
||||
PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data, strings);
|
||||
|
||||
Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
|
||||
Set<String> callableNames = collectCallableNames(
|
||||
packageData.getPackageProto().getFunctionList(),
|
||||
packageData.getPackageProto().getPropertyList(),
|
||||
packageData.getNameResolver()
|
||||
);
|
||||
assertEmpty(callableNames);
|
||||
}
|
||||
|
||||
@@ -90,15 +94,26 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
|
||||
assertNotNull(strings);
|
||||
PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data, strings);
|
||||
|
||||
Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
|
||||
Set<String> callableNames = collectCallableNames(
|
||||
packageData.getPackageProto().getFunctionList(),
|
||||
packageData.getPackageProto().getPropertyList(),
|
||||
packageData.getNameResolver()
|
||||
);
|
||||
assertSameElements(callableNames, Arrays.asList("foo", "bar"));
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static Set<String> collectCallableNames(@NotNull List<ProtoBuf.Callable> members, @NotNull NameResolver nameResolver) {
|
||||
public static Set<String> collectCallableNames(
|
||||
@NotNull List<ProtoBuf.Function> functions,
|
||||
@NotNull List<ProtoBuf.Property> properties,
|
||||
@NotNull NameResolver nameResolver
|
||||
) {
|
||||
Set<String> callableNames = new HashSet<String>();
|
||||
for (ProtoBuf.Callable callable : members) {
|
||||
callableNames.add(nameResolver.getName(callable.getName()).asString());
|
||||
for (ProtoBuf.Function function : functions) {
|
||||
callableNames.add(nameResolver.getName(function.getName()).asString());
|
||||
}
|
||||
for (ProtoBuf.Property property : properties) {
|
||||
callableNames.add(nameResolver.getName(property.getName()).asString());
|
||||
}
|
||||
return callableNames;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+27
-59
@@ -9,8 +9,6 @@ public final class DebugBuiltInsProtoBuf {
|
||||
com.google.protobuf.ExtensionRegistry registry) {
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.className);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.classAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.oldCallableAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.oldCompileTimeValue);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.constructorAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.functionAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.propertyAnnotation);
|
||||
@@ -40,28 +38,6 @@ public final class DebugBuiltInsProtoBuf {
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
|
||||
public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
|
||||
public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
|
||||
public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
|
||||
@@ -145,33 +121,27 @@ public final class DebugBuiltInsProtoBuf {
|
||||
"e\030\226\001 \003(\005B\002\020\001:t\n\020class_annotation\022).org.j" +
|
||||
"etbrains.kotlin.serialization.Class\030\226\001 \003" +
|
||||
"(\0132..org.jetbrains.kotlin.serialization." +
|
||||
"Annotation:~\n\027old_callable_annotation\022,." +
|
||||
"org.jetbrains.kotlin.serialization.Calla",
|
||||
"ble\030\226\001 \003(\0132..org.jetbrains.kotlin.serial" +
|
||||
"ization.Annotation:\214\001\n\026old_compile_time_" +
|
||||
"value\022,.org.jetbrains.kotlin.serializati" +
|
||||
"on.Callable\030\227\001 \001(\0132=.org.jetbrains.kotli" +
|
||||
"n.serialization.Annotation.Argument.Valu" +
|
||||
"e:\200\001\n\026constructor_annotation\022/.org.jetbr" +
|
||||
"ains.kotlin.serialization.Constructor\030\226\001" +
|
||||
" \003(\0132..org.jetbrains.kotlin.serializatio" +
|
||||
"n.Annotation:z\n\023function_annotation\022,.or" +
|
||||
"g.jetbrains.kotlin.serialization.Functio",
|
||||
"n\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" +
|
||||
"ation.Annotation:z\n\023property_annotation\022" +
|
||||
",.org.jetbrains.kotlin.serialization.Pro" +
|
||||
"perty\030\226\001 \003(\0132..org.jetbrains.kotlin.seri" +
|
||||
"alization.Annotation:\210\001\n\022compile_time_va" +
|
||||
"lue\022,.org.jetbrains.kotlin.serialization" +
|
||||
".Property\030\227\001 \001(\0132=.org.jetbrains.kotlin." +
|
||||
"serialization.Annotation.Argument.Value:" +
|
||||
"\201\001\n\024parameter_annotation\0222.org.jetbrains" +
|
||||
".kotlin.serialization.ValueParameter\030\226\001 ",
|
||||
"\003(\0132..org.jetbrains.kotlin.serialization" +
|
||||
".Annotation:r\n\017type_annotation\022(.org.jet" +
|
||||
"brains.kotlin.serialization.Type\030\226\001 \003(\0132" +
|
||||
"..org.jetbrains.kotlin.serialization.Ann" +
|
||||
"otationB\027B\025DebugBuiltInsProtoBuf"
|
||||
"Annotation:\200\001\n\026constructor_annotation\022/." +
|
||||
"org.jetbrains.kotlin.serialization.Const",
|
||||
"ructor\030\226\001 \003(\0132..org.jetbrains.kotlin.ser" +
|
||||
"ialization.Annotation:z\n\023function_annota" +
|
||||
"tion\022,.org.jetbrains.kotlin.serializatio" +
|
||||
"n.Function\030\226\001 \003(\0132..org.jetbrains.kotlin" +
|
||||
".serialization.Annotation:z\n\023property_an" +
|
||||
"notation\022,.org.jetbrains.kotlin.serializ" +
|
||||
"ation.Property\030\226\001 \003(\0132..org.jetbrains.ko" +
|
||||
"tlin.serialization.Annotation:\210\001\n\022compil" +
|
||||
"e_time_value\022,.org.jetbrains.kotlin.seri" +
|
||||
"alization.Property\030\227\001 \001(\0132=.org.jetbrain",
|
||||
"s.kotlin.serialization.Annotation.Argume" +
|
||||
"nt.Value:\201\001\n\024parameter_annotation\0222.org." +
|
||||
"jetbrains.kotlin.serialization.ValuePara" +
|
||||
"meter\030\226\001 \003(\0132..org.jetbrains.kotlin.seri" +
|
||||
"alization.Annotation:r\n\017type_annotation\022" +
|
||||
"(.org.jetbrains.kotlin.serialization.Typ" +
|
||||
"e\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" +
|
||||
"ation.AnnotationB\027B\025DebugBuiltInsProtoBu" +
|
||||
"f"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
@@ -180,14 +150,12 @@ public final class DebugBuiltInsProtoBuf {
|
||||
descriptor = root;
|
||||
className.internalInit(descriptor.getExtensions().get(0));
|
||||
classAnnotation.internalInit(descriptor.getExtensions().get(1));
|
||||
oldCallableAnnotation.internalInit(descriptor.getExtensions().get(2));
|
||||
oldCompileTimeValue.internalInit(descriptor.getExtensions().get(3));
|
||||
constructorAnnotation.internalInit(descriptor.getExtensions().get(4));
|
||||
functionAnnotation.internalInit(descriptor.getExtensions().get(5));
|
||||
propertyAnnotation.internalInit(descriptor.getExtensions().get(6));
|
||||
compileTimeValue.internalInit(descriptor.getExtensions().get(7));
|
||||
parameterAnnotation.internalInit(descriptor.getExtensions().get(8));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(9));
|
||||
constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
|
||||
functionAnnotation.internalInit(descriptor.getExtensions().get(3));
|
||||
propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
|
||||
compileTimeValue.internalInit(descriptor.getExtensions().get(5));
|
||||
parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(7));
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -8,8 +8,6 @@ public final class DebugJsProtoBuf {
|
||||
public static void registerAllExtensions(
|
||||
com.google.protobuf.ExtensionRegistry registry) {
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.classAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.oldCallableAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.oldCompileTimeValue);
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.constructorAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.functionAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.propertyAnnotation);
|
||||
@@ -1816,28 +1814,6 @@ public final class DebugJsProtoBuf {
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
|
||||
public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 130;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
|
||||
public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
|
||||
public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
|
||||
@@ -1938,33 +1914,26 @@ public final class DebugJsProtoBuf {
|
||||
"ent\030\002 \002(\014:t\n\020class_annotation\022).org.jetb" +
|
||||
"rains.kotlin.serialization.Class\030\202\001 \003(\0132" +
|
||||
"..org.jetbrains.kotlin.serialization.Ann",
|
||||
"otation:~\n\027old_callable_annotation\022,.org" +
|
||||
".jetbrains.kotlin.serialization.Callable" +
|
||||
"\030\202\001 \003(\0132..org.jetbrains.kotlin.serializa" +
|
||||
"tion.Annotation:\214\001\n\026old_compile_time_val" +
|
||||
"ue\022,.org.jetbrains.kotlin.serialization." +
|
||||
"Callable\030\203\001 \001(\0132=.org.jetbrains.kotlin.s" +
|
||||
"erialization.Annotation.Argument.Value:\200" +
|
||||
"\001\n\026constructor_annotation\022/.org.jetbrain" +
|
||||
"s.kotlin.serialization.Constructor\030\202\001 \003(" +
|
||||
"\0132..org.jetbrains.kotlin.serialization.A",
|
||||
"nnotation:z\n\023function_annotation\022,.org.j" +
|
||||
"etbrains.kotlin.serialization.Function\030\202" +
|
||||
"otation:\200\001\n\026constructor_annotation\022/.org" +
|
||||
".jetbrains.kotlin.serialization.Construc" +
|
||||
"tor\030\202\001 \003(\0132..org.jetbrains.kotlin.serial" +
|
||||
"ization.Annotation:z\n\023function_annotatio" +
|
||||
"n\022,.org.jetbrains.kotlin.serialization.F" +
|
||||
"unction\030\202\001 \003(\0132..org.jetbrains.kotlin.se" +
|
||||
"rialization.Annotation:z\n\023property_annot" +
|
||||
"ation\022,.org.jetbrains.kotlin.serializati" +
|
||||
"on.Property\030\202\001 \003(\0132..org.jetbrains.kotli" +
|
||||
"n.serialization.Annotation:\210\001\n\022compile_t",
|
||||
"ime_value\022,.org.jetbrains.kotlin.seriali" +
|
||||
"zation.Property\030\203\001 \001(\0132=.org.jetbrains.k" +
|
||||
"otlin.serialization.Annotation.Argument." +
|
||||
"Value:\201\001\n\024parameter_annotation\0222.org.jet" +
|
||||
"brains.kotlin.serialization.ValueParamet" +
|
||||
"er\030\202\001 \003(\0132..org.jetbrains.kotlin.seriali" +
|
||||
"zation.Annotation:r\n\017type_annotation\022(.o" +
|
||||
"rg.jetbrains.kotlin.serialization.Type\030\202" +
|
||||
"\001 \003(\0132..org.jetbrains.kotlin.serializati" +
|
||||
"on.Annotation:z\n\023property_annotation\022,.o" +
|
||||
"rg.jetbrains.kotlin.serialization.Proper" +
|
||||
"ty\030\202\001 \003(\0132..org.jetbrains.kotlin.seriali" +
|
||||
"zation.Annotation:\210\001\n\022compile_time_value" +
|
||||
"\022,.org.jetbrains.kotlin.serialization.Pr" +
|
||||
"operty\030\203\001 \001(\0132=.org.jetbrains.kotlin.ser" +
|
||||
"ialization.Annotation.Argument.Value:\201\001\n",
|
||||
"\024parameter_annotation\0222.org.jetbrains.ko" +
|
||||
"tlin.serialization.ValueParameter\030\202\001 \003(\013" +
|
||||
"2..org.jetbrains.kotlin.serialization.An" +
|
||||
"notation:r\n\017type_annotation\022(.org.jetbra" +
|
||||
"ins.kotlin.serialization.Type\030\202\001 \003(\0132..o" +
|
||||
"rg.jetbrains.kotlin.serialization.Annota" +
|
||||
"tionB\021B\017DebugJsProtoBuf"
|
||||
"on.AnnotationB\021B\017DebugJsProtoBuf"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
@@ -1990,14 +1959,12 @@ public final class DebugJsProtoBuf {
|
||||
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
|
||||
new java.lang.String[] { "Path", "Content", });
|
||||
classAnnotation.internalInit(descriptor.getExtensions().get(0));
|
||||
oldCallableAnnotation.internalInit(descriptor.getExtensions().get(1));
|
||||
oldCompileTimeValue.internalInit(descriptor.getExtensions().get(2));
|
||||
constructorAnnotation.internalInit(descriptor.getExtensions().get(3));
|
||||
functionAnnotation.internalInit(descriptor.getExtensions().get(4));
|
||||
propertyAnnotation.internalInit(descriptor.getExtensions().get(5));
|
||||
compileTimeValue.internalInit(descriptor.getExtensions().get(6));
|
||||
parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(8));
|
||||
constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
|
||||
functionAnnotation.internalInit(descriptor.getExtensions().get(2));
|
||||
propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
|
||||
compileTimeValue.internalInit(descriptor.getExtensions().get(4));
|
||||
parameterAnnotation.internalInit(descriptor.getExtensions().get(5));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(6));
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -12,9 +12,6 @@ public final class DebugJvmProtoBuf {
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.methodImplClassName);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertySignature);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertyImplClassName);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldMethodSignature);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldPropertySignature);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldImplClassName);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.typeAnnotation);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.isRaw);
|
||||
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.index);
|
||||
@@ -4581,39 +4578,6 @@ public final class DebugJvmProtoBuf {
|
||||
.newFileScopedGeneratedExtension(
|
||||
java.lang.Integer.class,
|
||||
null);
|
||||
public static final int OLD_METHOD_SIGNATURE_FIELD_NUMBER = 100;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> oldMethodSignature = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
|
||||
public static final int OLD_PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> oldPropertySignature = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
|
||||
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
|
||||
public static final int OLD_IMPL_CLASS_NAME_FIELD_NUMBER = 102;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
|
||||
*/
|
||||
public static final
|
||||
com.google.protobuf.GeneratedMessage.GeneratedExtension<
|
||||
org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
|
||||
java.lang.Integer> oldImplClassName = com.google.protobuf.GeneratedMessage
|
||||
.newFileScopedGeneratedExtension(
|
||||
java.lang.Integer.class,
|
||||
null);
|
||||
public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
|
||||
/**
|
||||
* <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
|
||||
@@ -4734,25 +4698,16 @@ public final class DebugJvmProtoBuf {
|
||||
"serialization.jvm.JvmPropertySignature:T",
|
||||
"\n\030property_impl_class_name\022,.org.jetbrai" +
|
||||
"ns.kotlin.serialization.Property\030e \001(\005B\004" +
|
||||
"\230\265\030\001:\206\001\n\024old_method_signature\022,.org.jetb" +
|
||||
"rains.kotlin.serialization.Callable\030d \001(" +
|
||||
"\0132:.org.jetbrains.kotlin.serialization.j" +
|
||||
"vm.JvmMethodSignature:\212\001\n\026old_property_s" +
|
||||
"ignature\022,.org.jetbrains.kotlin.serializ" +
|
||||
"ation.Callable\030e \001(\0132<.org.jetbrains.kot" +
|
||||
"lin.serialization.jvm.JvmPropertySignatu" +
|
||||
"re:O\n\023old_impl_class_name\022,.org.jetbrain",
|
||||
"s.kotlin.serialization.Callable\030f \001(\005B\004\210" +
|
||||
"\265\030\001:q\n\017type_annotation\022(.org.jetbrains.k" +
|
||||
"otlin.serialization.Type\030d \003(\0132..org.jet" +
|
||||
"brains.kotlin.serialization.Annotation:8" +
|
||||
"\n\006is_raw\022(.org.jetbrains.kotlin.serializ" +
|
||||
"ation.Type\030e \001(\010:A\n\005index\0222.org.jetbrain" +
|
||||
"s.kotlin.serialization.ValueParameter\030d " +
|
||||
"\001(\005:s\n\020class_annotation\022).org.jetbrains." +
|
||||
"kotlin.serialization.Class\030d \003(\0132..org.j" +
|
||||
"etbrains.kotlin.serialization.Annotation",
|
||||
"B\022B\020DebugJvmProtoBuf"
|
||||
"\230\265\030\001:q\n\017type_annotation\022(.org.jetbrains." +
|
||||
"kotlin.serialization.Type\030d \003(\0132..org.je" +
|
||||
"tbrains.kotlin.serialization.Annotation:" +
|
||||
"8\n\006is_raw\022(.org.jetbrains.kotlin.seriali" +
|
||||
"zation.Type\030e \001(\010:A\n\005index\0222.org.jetbrai" +
|
||||
"ns.kotlin.serialization.ValueParameter\030d" +
|
||||
" \001(\005:s\n\020class_annotation\022).org.jetbrains" +
|
||||
".kotlin.serialization.Class\030d \003(\0132..org.",
|
||||
"jetbrains.kotlin.serialization.Annotatio" +
|
||||
"nB\022B\020DebugJvmProtoBuf"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
@@ -4794,13 +4749,10 @@ public final class DebugJvmProtoBuf {
|
||||
methodImplClassName.internalInit(descriptor.getExtensions().get(2));
|
||||
propertySignature.internalInit(descriptor.getExtensions().get(3));
|
||||
propertyImplClassName.internalInit(descriptor.getExtensions().get(4));
|
||||
oldMethodSignature.internalInit(descriptor.getExtensions().get(5));
|
||||
oldPropertySignature.internalInit(descriptor.getExtensions().get(6));
|
||||
oldImplClassName.internalInit(descriptor.getExtensions().get(7));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(8));
|
||||
isRaw.internalInit(descriptor.getExtensions().get(9));
|
||||
index.internalInit(descriptor.getExtensions().get(10));
|
||||
classAnnotation.internalInit(descriptor.getExtensions().get(11));
|
||||
typeAnnotation.internalInit(descriptor.getExtensions().get(5));
|
||||
isRaw.internalInit(descriptor.getExtensions().get(6));
|
||||
index.internalInit(descriptor.getExtensions().get(7));
|
||||
classAnnotation.internalInit(descriptor.getExtensions().get(8));
|
||||
com.google.protobuf.ExtensionRegistry registry =
|
||||
com.google.protobuf.ExtensionRegistry.newInstance();
|
||||
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
|
||||
@@ -4809,7 +4761,6 @@ public final class DebugJvmProtoBuf {
|
||||
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
|
||||
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
|
||||
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
|
||||
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
|
||||
return registry;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user