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

Exclude kdoc related stuff from proto comparison in IC (#4283)

Browse Source
This commit is contained in:
Vladimir Ivanov
2021-04-07 17:16:06 +03:00
committed by GitHub
parent 9e6cf11026
commit 61883ee878
3 changed files with 178 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/library/metadata/DebugKlibMetadataProtoBuf.java
+153 -90
View File
@@ -10,17 +10,21 @@ public final class DebugKlibMetadataProtoBuf {
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.packageFqName); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.packageFqName);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classFile); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classFile);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classKdoc);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classUniqId); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classUniqId);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorKdoc);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorUniqId); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorUniqId);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionFile); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionFile);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionKdoc);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionUniqId); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionUniqId);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyGetterAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyGetterAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertySetterAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertySetterAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.compileTimeValue); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.compileTimeValue);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyFile); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyFile);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyKdoc);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyUniqId); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyUniqId);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryAnnotation); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryAnnotation);
registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryOrdinal); registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryOrdinal);
@@ -3163,6 +3167,17 @@ public final class DebugKlibMetadataProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
java.lang.Integer.class, java.lang.Integer.class,
null); null);
public static final int CLASS_KDOC_FIELD_NUMBER = 176;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
java.lang.String> classKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.String.class,
null);
public static final int CLASS_UNIQ_ID_FIELD_NUMBER = 171; public static final int CLASS_UNIQ_ID_FIELD_NUMBER = 171;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
@@ -3185,6 +3200,17 @@ public final class DebugKlibMetadataProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance()); org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
public static final int CONSTRUCTOR_KDOC_FIELD_NUMBER = 173;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
java.lang.String> constructorKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.String.class,
null);
public static final int CONSTRUCTOR_UNIQ_ID_FIELD_NUMBER = 172; public static final int CONSTRUCTOR_UNIQ_ID_FIELD_NUMBER = 172;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
@@ -3218,6 +3244,17 @@ public final class DebugKlibMetadataProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
java.lang.Integer.class, java.lang.Integer.class,
null); null);
public static final int FUNCTION_KDOC_FIELD_NUMBER = 174;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
java.lang.String> functionKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.String.class,
null);
public static final int FUNCTION_UNIQ_ID_FIELD_NUMBER = 173; public static final int FUNCTION_UNIQ_ID_FIELD_NUMBER = 173;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
@@ -3284,6 +3321,17 @@ public final class DebugKlibMetadataProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
java.lang.Integer.class, java.lang.Integer.class,
null); null);
public static final int PROPERTY_KDOC_FIELD_NUMBER = 180;
/**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
java.lang.String> propertyKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.String.class,
null);
public static final int PROPERTY_UNIQ_ID_FIELD_NUMBER = 179; public static final int PROPERTY_UNIQ_ID_FIELD_NUMBER = 179;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -3480,72 +3528,79 @@ public final class DebugKlibMetadataProtoBuf {
".metadata.Class\030\252\001 \003(\0132).org.jetbrains.k" + ".metadata.Class\030\252\001 \003(\0132).org.jetbrains.k" +
"otlin.metadata.Annotation:?\n\nclass_file\022", "otlin.metadata.Annotation:?\n\nclass_file\022",
"$.org.jetbrains.kotlin.metadata.Class\030\257\001" + "$.org.jetbrains.kotlin.metadata.Class\030\257\001" +
" \001(\005B\004\200\265\030\001:u\n\rclass_uniq_id\022$.org.jetbra" + " \001(\005B\004\200\265\030\001:?\n\nclass_kdoc\022$.org.jetbrains" +
"ins.kotlin.metadata.Class\030\253\001 \001(\01327.org.j" + ".kotlin.metadata.Class\030\260\001 \001(\tB\004\200\265\030\001:u\n\rc" +
"etbrains.kotlin.library.metadata.Descrip" + "lass_uniq_id\022$.org.jetbrains.kotlin.meta" +
"torUniqId:v\n\026constructor_annotation\022*.or" + "data.Class\030\253\001 \001(\01327.org.jetbrains.kotlin" +
"g.jetbrains.kotlin.metadata.Constructor\030" + ".library.metadata.DescriptorUniqId:v\n\026co" +
"\252\001 \003(\0132).org.jetbrains.kotlin.metadata.A" + "nstructor_annotation\022*.org.jetbrains.kot" +
"nnotation:\201\001\n\023constructor_uniq_id\022*.org." + "lin.metadata.Constructor\030\252\001 \003(\0132).org.je" +
"jetbrains.kotlin.metadata.Constructor\030\254\001" + "tbrains.kotlin.metadata.Annotation:K\n\020co" +
" \001(\01327.org.jetbrains.kotlin.library.meta", "nstructor_kdoc\022*.org.jetbrains.kotlin.me",
"data.DescriptorUniqId:p\n\023function_annota" + "tadata.Constructor\030\255\001 \001(\tB\004\200\265\030\001:\201\001\n\023cons" +
"tion\022\'.org.jetbrains.kotlin.metadata.Fun" + "tructor_uniq_id\022*.org.jetbrains.kotlin.m" +
"ction\030\252\001 \003(\0132).org.jetbrains.kotlin.meta" + "etadata.Constructor\030\254\001 \001(\01327.org.jetbrai" +
"data.Annotation:E\n\rfunction_file\022\'.org.j" + "ns.kotlin.library.metadata.DescriptorUni" +
"etbrains.kotlin.metadata.Function\030\254\001 \001(\005" + "qId:p\n\023function_annotation\022\'.org.jetbrai" +
"B\004\200\265\030\001:{\n\020function_uniq_id\022\'.org.jetbrai" + "ns.kotlin.metadata.Function\030\252\001 \003(\0132).org" +
"ns.kotlin.metadata.Function\030\255\001 \001(\01327.org" + ".jetbrains.kotlin.metadata.Annotation:E\n" +
".jetbrains.kotlin.library.metadata.Descr" + "\rfunction_file\022\'.org.jetbrains.kotlin.me" +
"iptorUniqId:p\n\023property_annotation\022\'.org" + "tadata.Function\030\254\001 \001(\005B\004\200\265\030\001:E\n\rfunction" +
".jetbrains.kotlin.metadata.Property\030\252\001 \003", "_kdoc\022\'.org.jetbrains.kotlin.metadata.Fu",
"(\0132).org.jetbrains.kotlin.metadata.Annot" + "nction\030\256\001 \001(\tB\004\200\265\030\001:{\n\020function_uniq_id\022" +
"ation:w\n\032property_getter_annotation\022\'.or" + "\'.org.jetbrains.kotlin.metadata.Function" +
"g.jetbrains.kotlin.metadata.Property\030\261\001 " + "\030\255\001 \001(\01327.org.jetbrains.kotlin.library.m" +
"\003(\0132).org.jetbrains.kotlin.metadata.Anno" + "etadata.DescriptorUniqId:p\n\023property_ann" +
"tation:w\n\032property_setter_annotation\022\'.o" + "otation\022\'.org.jetbrains.kotlin.metadata." +
"rg.jetbrains.kotlin.metadata.Property\030\262\001" + "Property\030\252\001 \003(\0132).org.jetbrains.kotlin.m" +
" \003(\0132).org.jetbrains.kotlin.metadata.Ann" + "etadata.Annotation:w\n\032property_getter_an" +
"otation:~\n\022compile_time_value\022\'.org.jetb" + "notation\022\'.org.jetbrains.kotlin.metadata" +
"rains.kotlin.metadata.Property\030\255\001 \001(\01328." + ".Property\030\261\001 \003(\0132).org.jetbrains.kotlin." +
"org.jetbrains.kotlin.metadata.Annotation", "metadata.Annotation:w\n\032property_setter_a",
".Argument.Value:E\n\rproperty_file\022\'.org.j" + "nnotation\022\'.org.jetbrains.kotlin.metadat" +
"etbrains.kotlin.metadata.Property\030\260\001 \001(\005" + "a.Property\030\262\001 \003(\0132).org.jetbrains.kotlin" +
"B\004\200\265\030\001:{\n\020property_uniq_id\022\'.org.jetbrai" + ".metadata.Annotation:~\n\022compile_time_val" +
"ns.kotlin.metadata.Property\030\263\001 \001(\01327.org" + "ue\022\'.org.jetbrains.kotlin.metadata.Prope" +
".jetbrains.kotlin.library.metadata.Descr" + "rty\030\255\001 \001(\01328.org.jetbrains.kotlin.metada" +
"iptorUniqId:s\n\025enum_entry_annotation\022(.o" + "ta.Annotation.Argument.Value:E\n\rproperty" +
"rg.jetbrains.kotlin.metadata.EnumEntry\030\252" + "_file\022\'.org.jetbrains.kotlin.metadata.Pr" +
"\001 \003(\0132).org.jetbrains.kotlin.metadata.An" + "operty\030\260\001 \001(\005B\004\200\265\030\001:E\n\rproperty_kdoc\022\'.o" +
"notation:E\n\022enum_entry_ordinal\022(.org.jet" + "rg.jetbrains.kotlin.metadata.Property\030\264\001" +
"brains.kotlin.metadata.EnumEntry\030\253\001 \001(\005:", " \001(\tB\004\200\265\030\001:{\n\020property_uniq_id\022\'.org.jet",
"~\n\022enum_entry_uniq_id\022(.org.jetbrains.ko" + "brains.kotlin.metadata.Property\030\263\001 \001(\01327" +
"tlin.metadata.EnumEntry\030\254\001 \001(\01327.org.jet" + ".org.jetbrains.kotlin.library.metadata.D" +
"brains.kotlin.library.metadata.Descripto" + "escriptorUniqId:s\n\025enum_entry_annotation" +
"rUniqId:w\n\024parameter_annotation\022-.org.je" + "\022(.org.jetbrains.kotlin.metadata.EnumEnt" +
"tbrains.kotlin.metadata.ValueParameter\030\252" + "ry\030\252\001 \003(\0132).org.jetbrains.kotlin.metadat" +
"\001 \003(\0132).org.jetbrains.kotlin.metadata.An" + "a.Annotation:E\n\022enum_entry_ordinal\022(.org" +
"notation:h\n\017type_annotation\022#.org.jetbra" + ".jetbrains.kotlin.metadata.EnumEntry\030\253\001 " +
"ins.kotlin.metadata.Type\030\252\001 \003(\0132).org.je" + "\001(\005:~\n\022enum_entry_uniq_id\022(.org.jetbrain" +
"tbrains.kotlin.metadata.Annotation:{\n\031ty" + "s.kotlin.metadata.EnumEntry\030\254\001 \001(\01327.org" +
"pe_parameter_annotation\022,.org.jetbrains.", ".jetbrains.kotlin.library.metadata.Descr",
"kotlin.metadata.TypeParameter\030\252\001 \003(\0132).o" + "iptorUniqId:w\n\024parameter_annotation\022-.or" +
"rg.jetbrains.kotlin.metadata.Annotation:" + "g.jetbrains.kotlin.metadata.ValueParamet" +
"\202\001\n\022type_param_uniq_id\022,.org.jetbrains.k" + "er\030\252\001 \003(\0132).org.jetbrains.kotlin.metadat" +
"otlin.metadata.TypeParameter\030\253\001 \001(\01327.or" + "a.Annotation:h\n\017type_annotation\022#.org.je" +
"g.jetbrains.kotlin.library.metadata.Desc" + "tbrains.kotlin.metadata.Type\030\252\001 \003(\0132).or" +
"riptorUniqId:U\n\026package_fragment_files\022." + "g.jetbrains.kotlin.metadata.Annotation:{" +
".org.jetbrains.kotlin.metadata.PackageFr" + "\n\031type_parameter_annotation\022,.org.jetbra" +
"agment\030\252\001 \003(\005B\004\200\265\030\001:A\n\010is_empty\022..org.je" + "ins.kotlin.metadata.TypeParameter\030\252\001 \003(\013" +
"tbrains.kotlin.metadata.PackageFragment\030" + "2).org.jetbrains.kotlin.metadata.Annotat" +
"\254\001 \001(\010:@\n\007fq_name\022..org.jetbrains.kotlin", "ion:\202\001\n\022type_param_uniq_id\022,.org.jetbrai",
".metadata.PackageFragment\030\255\001 \001(\t:G\n\nclas" + "ns.kotlin.metadata.TypeParameter\030\253\001 \001(\0132" +
"s_name\022..org.jetbrains.kotlin.metadata.P" + "7.org.jetbrains.kotlin.library.metadata." +
"ackageFragment\030\256\001 \003(\005B\002\020\001:~\n\022type_alias_" + "DescriptorUniqId:U\n\026package_fragment_fil" +
"uniq_id\022(.org.jetbrains.kotlin.metadata." + "es\022..org.jetbrains.kotlin.metadata.Packa" +
"TypeAlias\030\203\001 \001(\01327.org.jetbrains.kotlin." + "geFragment\030\252\001 \003(\005B\004\200\265\030\001:A\n\010is_empty\022..or" +
"library.metadata.DescriptorUniqIdB\033B\031Deb" + "g.jetbrains.kotlin.metadata.PackageFragm" +
"ugKlibMetadataProtoBuf" "ent\030\254\001 \001(\010:@\n\007fq_name\022..org.jetbrains.ko" +
"tlin.metadata.PackageFragment\030\255\001 \001(\t:G\n\n" +
"class_name\022..org.jetbrains.kotlin.metada" +
"ta.PackageFragment\030\256\001 \003(\005B\002\020\001:~\n\022type_al",
"ias_uniq_id\022(.org.jetbrains.kotlin.metad" +
"ata.TypeAlias\030\203\001 \001(\01327.org.jetbrains.kot" +
"lin.library.metadata.DescriptorUniqIdB\033B" +
"\031DebugKlibMetadataProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -3582,30 +3637,34 @@ public final class DebugKlibMetadataProtoBuf {
packageFqName.internalInit(descriptor.getExtensions().get(0)); packageFqName.internalInit(descriptor.getExtensions().get(0));
classAnnotation.internalInit(descriptor.getExtensions().get(1)); classAnnotation.internalInit(descriptor.getExtensions().get(1));
classFile.internalInit(descriptor.getExtensions().get(2)); classFile.internalInit(descriptor.getExtensions().get(2));
classUniqId.internalInit(descriptor.getExtensions().get(3)); classKdoc.internalInit(descriptor.getExtensions().get(3));
constructorAnnotation.internalInit(descriptor.getExtensions().get(4)); classUniqId.internalInit(descriptor.getExtensions().get(4));
constructorUniqId.internalInit(descriptor.getExtensions().get(5)); constructorAnnotation.internalInit(descriptor.getExtensions().get(5));
functionAnnotation.internalInit(descriptor.getExtensions().get(6)); constructorKdoc.internalInit(descriptor.getExtensions().get(6));
functionFile.internalInit(descriptor.getExtensions().get(7)); constructorUniqId.internalInit(descriptor.getExtensions().get(7));
functionUniqId.internalInit(descriptor.getExtensions().get(8)); functionAnnotation.internalInit(descriptor.getExtensions().get(8));
propertyAnnotation.internalInit(descriptor.getExtensions().get(9)); functionFile.internalInit(descriptor.getExtensions().get(9));
propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(10)); functionKdoc.internalInit(descriptor.getExtensions().get(10));
propertySetterAnnotation.internalInit(descriptor.getExtensions().get(11)); functionUniqId.internalInit(descriptor.getExtensions().get(11));
compileTimeValue.internalInit(descriptor.getExtensions().get(12)); propertyAnnotation.internalInit(descriptor.getExtensions().get(12));
propertyFile.internalInit(descriptor.getExtensions().get(13)); propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(13));
propertyUniqId.internalInit(descriptor.getExtensions().get(14)); propertySetterAnnotation.internalInit(descriptor.getExtensions().get(14));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(15)); compileTimeValue.internalInit(descriptor.getExtensions().get(15));
enumEntryOrdinal.internalInit(descriptor.getExtensions().get(16)); propertyFile.internalInit(descriptor.getExtensions().get(16));
enumEntryUniqId.internalInit(descriptor.getExtensions().get(17)); propertyKdoc.internalInit(descriptor.getExtensions().get(17));
parameterAnnotation.internalInit(descriptor.getExtensions().get(18)); propertyUniqId.internalInit(descriptor.getExtensions().get(18));
typeAnnotation.internalInit(descriptor.getExtensions().get(19)); enumEntryAnnotation.internalInit(descriptor.getExtensions().get(19));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(20)); enumEntryOrdinal.internalInit(descriptor.getExtensions().get(20));
typeParamUniqId.internalInit(descriptor.getExtensions().get(21)); enumEntryUniqId.internalInit(descriptor.getExtensions().get(21));
packageFragmentFiles.internalInit(descriptor.getExtensions().get(22)); parameterAnnotation.internalInit(descriptor.getExtensions().get(22));
isEmpty.internalInit(descriptor.getExtensions().get(23)); typeAnnotation.internalInit(descriptor.getExtensions().get(23));
fqName.internalInit(descriptor.getExtensions().get(24)); typeParameterAnnotation.internalInit(descriptor.getExtensions().get(24));
className.internalInit(descriptor.getExtensions().get(25)); typeParamUniqId.internalInit(descriptor.getExtensions().get(25));
typeAliasUniqId.internalInit(descriptor.getExtensions().get(26)); packageFragmentFiles.internalInit(descriptor.getExtensions().get(26));
isEmpty.internalInit(descriptor.getExtensions().get(27));
fqName.internalInit(descriptor.getExtensions().get(28));
className.internalInit(descriptor.getExtensions().get(29));
typeAliasUniqId.internalInit(descriptor.getExtensions().get(30));
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry = org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance(); org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipMessageInComparison); registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipMessageInComparison);
@@ -3613,6 +3672,10 @@ public final class DebugKlibMetadataProtoBuf {
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison); registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison); registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison); registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalUpdateFileDescriptor(descriptor, registry); .internalUpdateFileDescriptor(descriptor, registry);
org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(); org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
compiler/util-klib-metadata/src/KlibMetadataProtoBuf.proto
+4 -4
View File
@@ -60,20 +60,20 @@ extend org.jetbrains.kotlin.metadata.Package {
extend org.jetbrains.kotlin.metadata.Class { extend org.jetbrains.kotlin.metadata.Class {
repeated org.jetbrains.kotlin.metadata.Annotation class_annotation = 170; repeated org.jetbrains.kotlin.metadata.Annotation class_annotation = 170;
optional int32 class_file = 175 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true]; optional int32 class_file = 175 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional string class_kdoc = 176; optional string class_kdoc = 176 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional DescriptorUniqId class_uniq_id = 171; optional DescriptorUniqId class_uniq_id = 171;
} }
extend org.jetbrains.kotlin.metadata.Constructor { extend org.jetbrains.kotlin.metadata.Constructor {
repeated org.jetbrains.kotlin.metadata.Annotation constructor_annotation = 170; repeated org.jetbrains.kotlin.metadata.Annotation constructor_annotation = 170;
optional string constructor_kdoc = 173; optional string constructor_kdoc = 173 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional DescriptorUniqId constructor_uniq_id = 172; optional DescriptorUniqId constructor_uniq_id = 172;
} }
extend org.jetbrains.kotlin.metadata.Function { extend org.jetbrains.kotlin.metadata.Function {
repeated org.jetbrains.kotlin.metadata.Annotation function_annotation = 170; repeated org.jetbrains.kotlin.metadata.Annotation function_annotation = 170;
optional int32 function_file = 172 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true]; optional int32 function_file = 172 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional string function_kdoc = 174; optional string function_kdoc = 174 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional DescriptorUniqId function_uniq_id = 173; optional DescriptorUniqId function_uniq_id = 173;
} }
@@ -83,7 +83,7 @@ extend org.jetbrains.kotlin.metadata.Property {
repeated org.jetbrains.kotlin.metadata.Annotation property_setter_annotation = 178; repeated org.jetbrains.kotlin.metadata.Annotation property_setter_annotation = 178;
optional org.jetbrains.kotlin.metadata.Annotation.Argument.Value compile_time_value = 173; optional org.jetbrains.kotlin.metadata.Annotation.Argument.Value compile_time_value = 173;
optional int32 property_file = 176 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true]; optional int32 property_file = 176 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional string property_kdoc = 180; optional string property_kdoc = 180 [(org.jetbrains.kotlin.metadata.skip_in_comparison) = true];
optional DescriptorUniqId property_uniq_id = 179; optional DescriptorUniqId property_uniq_id = 179;
} }
compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataProtoBuf.java
+21 -21
View File
@@ -2618,17 +2618,17 @@ public final class KlibMetadataProtoBuf {
* <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
*/ */
public static final public static final
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.kotlin.metadata.ProtoBuf.Constructor, org.jetbrains.kotlin.metadata.ProtoBuf.Constructor,
java.lang.String> constructorKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessageLite java.lang.String> constructorKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension( .newSingularGeneratedExtension(
org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(), org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(),
"", "",
null, null,
null, null,
173, 173,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.STRING, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.STRING,
java.lang.String.class); java.lang.String.class);
public static final int CONSTRUCTOR_UNIQ_ID_FIELD_NUMBER = 172; public static final int CONSTRUCTOR_UNIQ_ID_FIELD_NUMBER = 172;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
@@ -2794,17 +2794,17 @@ public final class KlibMetadataProtoBuf {
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
*/ */
public static final public static final
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.kotlin.metadata.ProtoBuf.Property, org.jetbrains.kotlin.metadata.ProtoBuf.Property,
java.lang.String> propertyKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessageLite java.lang.String> propertyKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension( .newSingularGeneratedExtension(
org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(), org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
"", "",
null, null,
null, null,
180, 180,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.STRING, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.STRING,
java.lang.String.class); java.lang.String.class);
public static final int PROPERTY_UNIQ_ID_FIELD_NUMBER = 179; public static final int PROPERTY_UNIQ_ID_FIELD_NUMBER = 179;
/** /**
* <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -3026,4 +3026,4 @@ public final class KlibMetadataProtoBuf {
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
} }