Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change _Extensions property to normal body rather than expression #6856

Merged
merged 1 commit into from Nov 8, 2019
Merged

Change _Extensions property to normal body rather than expression #6856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto2.cs
View file
Open in desktop
Expand Up @@ -248,7 +248,7 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
private static readonly pb::MessageParser<TestAllTypesProto2> _parser = new pb::MessageParser<TestAllTypesProto2>(() => new TestAllTypesProto2());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestAllTypesProto2> _extensions;
private pb::ExtensionSet<TestAllTypesProto2> _Extensions => _extensions;
private pb::ExtensionSet<TestAllTypesProto2> _Extensions { get { return _extensions; } }
private int _hasBits0;
private int _hasBits1;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -4319,7 +4319,7 @@ public sealed partial class MessageSetCorrect : pb::IExtendableMessage<MessageSe
private static readonly pb::MessageParser<MessageSetCorrect> _parser = new pb::MessageParser<MessageSetCorrect>(() => new MessageSetCorrect());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<MessageSetCorrect> _extensions;
private pb::ExtensionSet<MessageSetCorrect> _Extensions => _extensions;
private pb::ExtensionSet<MessageSetCorrect> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<MessageSetCorrect> Parser { get { return _parser; } }

Expand Down
20 changes: 10 additions & 10 deletions csharp/src/Google.Protobuf.Test/TestProtos/Unittest.cs
View file
Open in desktop
Expand Up @@ -5139,7 +5139,7 @@ public sealed partial class TestAllExtensions : pb::IExtendableMessage<TestAllEx
private static readonly pb::MessageParser<TestAllExtensions> _parser = new pb::MessageParser<TestAllExtensions>(() => new TestAllExtensions());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestAllExtensions> _extensions;
private pb::ExtensionSet<TestAllExtensions> _Extensions => _extensions;
private pb::ExtensionSet<TestAllExtensions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestAllExtensions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -5914,7 +5914,7 @@ public sealed partial class TestGroupExtension : pb::IExtendableMessage<TestGrou
private static readonly pb::MessageParser<TestGroupExtension> _parser = new pb::MessageParser<TestGroupExtension>(() => new TestGroupExtension());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestGroupExtension> _extensions;
private pb::ExtensionSet<TestGroupExtension> _Extensions => _extensions;
private pb::ExtensionSet<TestGroupExtension> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestGroupExtension> Parser { get { return _parser; } }

Expand Down Expand Up @@ -8485,7 +8485,7 @@ public sealed partial class TestEmptyMessageWithExtensions : pb::IExtendableMess
private static readonly pb::MessageParser<TestEmptyMessageWithExtensions> _parser = new pb::MessageParser<TestEmptyMessageWithExtensions>(() => new TestEmptyMessageWithExtensions());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestEmptyMessageWithExtensions> _extensions;
private pb::ExtensionSet<TestEmptyMessageWithExtensions> _Extensions => _extensions;
private pb::ExtensionSet<TestEmptyMessageWithExtensions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestEmptyMessageWithExtensions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -8626,7 +8626,7 @@ public sealed partial class TestMultipleExtensionRanges : pb::IExtendableMessage
private static readonly pb::MessageParser<TestMultipleExtensionRanges> _parser = new pb::MessageParser<TestMultipleExtensionRanges>(() => new TestMultipleExtensionRanges());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestMultipleExtensionRanges> _extensions;
private pb::ExtensionSet<TestMultipleExtensionRanges> _Extensions => _extensions;
private pb::ExtensionSet<TestMultipleExtensionRanges> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestMultipleExtensionRanges> Parser { get { return _parser; } }

Expand Down Expand Up @@ -11936,7 +11936,7 @@ public sealed partial class TestFieldOrderings : pb::IExtendableMessage<TestFiel
private static readonly pb::MessageParser<TestFieldOrderings> _parser = new pb::MessageParser<TestFieldOrderings>(() => new TestFieldOrderings());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestFieldOrderings> _extensions;
private pb::ExtensionSet<TestFieldOrderings> _Extensions => _extensions;
private pb::ExtensionSet<TestFieldOrderings> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestFieldOrderings> Parser { get { return _parser; } }
Expand Down Expand Up @@ -19250,7 +19250,7 @@ public sealed partial class TestPackedExtensions : pb::IExtendableMessage<TestPa
private static readonly pb::MessageParser<TestPackedExtensions> _parser = new pb::MessageParser<TestPackedExtensions>(() => new TestPackedExtensions());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestPackedExtensions> _extensions;
private pb::ExtensionSet<TestPackedExtensions> _Extensions => _extensions;
private pb::ExtensionSet<TestPackedExtensions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestPackedExtensions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -19391,7 +19391,7 @@ public sealed partial class TestUnpackedExtensions : pb::IExtendableMessage<Test
private static readonly pb::MessageParser<TestUnpackedExtensions> _parser = new pb::MessageParser<TestUnpackedExtensions>(() => new TestUnpackedExtensions());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestUnpackedExtensions> _extensions;
private pb::ExtensionSet<TestUnpackedExtensions> _Extensions => _extensions;
private pb::ExtensionSet<TestUnpackedExtensions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestUnpackedExtensions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -20294,7 +20294,7 @@ public sealed partial class TestParsingMerge : pb::IExtendableMessage<TestParsin
private static readonly pb::MessageParser<TestParsingMerge> _parser = new pb::MessageParser<TestParsingMerge>(() => new TestParsingMerge());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestParsingMerge> _extensions;
private pb::ExtensionSet<TestParsingMerge> _Extensions => _extensions;
private pb::ExtensionSet<TestParsingMerge> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestParsingMerge> Parser { get { return _parser; } }

Expand Down Expand Up @@ -22571,7 +22571,7 @@ public sealed partial class TestHugeFieldNumbers : pb::IExtendableMessage<TestHu
private static readonly pb::MessageParser<TestHugeFieldNumbers> _parser = new pb::MessageParser<TestHugeFieldNumbers>(() => new TestHugeFieldNumbers());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestHugeFieldNumbers> _extensions;
private pb::ExtensionSet<TestHugeFieldNumbers> _Extensions => _extensions;
private pb::ExtensionSet<TestHugeFieldNumbers> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestHugeFieldNumbers> Parser { get { return _parser; } }
Expand Down Expand Up @@ -23426,7 +23426,7 @@ public sealed partial class TestExtensionInsideTable : pb::IExtendableMessage<Te
private static readonly pb::MessageParser<TestExtensionInsideTable> _parser = new pb::MessageParser<TestExtensionInsideTable>(() => new TestExtensionInsideTable());
private pb::UnknownFieldSet _unknownFields;
private pb::ExtensionSet<TestExtensionInsideTable> _extensions;
private pb::ExtensionSet<TestExtensionInsideTable> _Extensions => _extensions;
private pb::ExtensionSet<TestExtensionInsideTable> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<TestExtensionInsideTable> Parser { get { return _parser; } }
Expand Down
18 changes: 9 additions & 9 deletions csharp/src/Google.Protobuf/Reflection/Descriptor.cs
View file
Open in desktop
Expand Up @@ -1591,7 +1591,7 @@ public sealed partial class ExtensionRangeOptions : pb::IExtendableMessage<Exten
private static readonly pb::MessageParser<ExtensionRangeOptions> _parser = new pb::MessageParser<ExtensionRangeOptions>(() => new ExtensionRangeOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<ExtensionRangeOptions> _extensions;
private pb::ExtensionSet<ExtensionRangeOptions> _Extensions => _extensions;
private pb::ExtensionSet<ExtensionRangeOptions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<ExtensionRangeOptions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -3820,7 +3820,7 @@ public sealed partial class FileOptions : pb::IExtendableMessage<FileOptions> {
private static readonly pb::MessageParser<FileOptions> _parser = new pb::MessageParser<FileOptions>(() => new FileOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<FileOptions> _extensions;
private pb::ExtensionSet<FileOptions> _Extensions => _extensions;
private pb::ExtensionSet<FileOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<FileOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -4918,7 +4918,7 @@ public sealed partial class MessageOptions : pb::IExtendableMessage<MessageOptio
private static readonly pb::MessageParser<MessageOptions> _parser = new pb::MessageParser<MessageOptions>(() => new MessageOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<MessageOptions> _extensions;
private pb::ExtensionSet<MessageOptions> _Extensions => _extensions;
private pb::ExtensionSet<MessageOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<MessageOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -5302,7 +5302,7 @@ public sealed partial class FieldOptions : pb::IExtendableMessage<FieldOptions>
private static readonly pb::MessageParser<FieldOptions> _parser = new pb::MessageParser<FieldOptions>(() => new FieldOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<FieldOptions> _extensions;
private pb::ExtensionSet<FieldOptions> _Extensions => _extensions;
private pb::ExtensionSet<FieldOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<FieldOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -5809,7 +5809,7 @@ public sealed partial class OneofOptions : pb::IExtendableMessage<OneofOptions>
private static readonly pb::MessageParser<OneofOptions> _parser = new pb::MessageParser<OneofOptions>(() => new OneofOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<OneofOptions> _extensions;
private pb::ExtensionSet<OneofOptions> _Extensions => _extensions;
private pb::ExtensionSet<OneofOptions> _Extensions { get { return _extensions; } }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<OneofOptions> Parser { get { return _parser; } }

Expand Down Expand Up @@ -5973,7 +5973,7 @@ public sealed partial class EnumOptions : pb::IExtendableMessage<EnumOptions> {
private static readonly pb::MessageParser<EnumOptions> _parser = new pb::MessageParser<EnumOptions>(() => new EnumOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<EnumOptions> _extensions;
private pb::ExtensionSet<EnumOptions> _Extensions => _extensions;
private pb::ExtensionSet<EnumOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<EnumOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -6231,7 +6231,7 @@ public sealed partial class EnumValueOptions : pb::IExtendableMessage<EnumValueO
private static readonly pb::MessageParser<EnumValueOptions> _parser = new pb::MessageParser<EnumValueOptions>(() => new EnumValueOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<EnumValueOptions> _extensions;
private pb::ExtensionSet<EnumValueOptions> _Extensions => _extensions;
private pb::ExtensionSet<EnumValueOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<EnumValueOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -6444,7 +6444,7 @@ public sealed partial class ServiceOptions : pb::IExtendableMessage<ServiceOptio
private static readonly pb::MessageParser<ServiceOptions> _parser = new pb::MessageParser<ServiceOptions>(() => new ServiceOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<ServiceOptions> _extensions;
private pb::ExtensionSet<ServiceOptions> _Extensions => _extensions;
private pb::ExtensionSet<ServiceOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<ServiceOptions> Parser { get { return _parser; } }
Expand Down Expand Up @@ -6657,7 +6657,7 @@ public sealed partial class MethodOptions : pb::IExtendableMessage<MethodOptions
private static readonly pb::MessageParser<MethodOptions> _parser = new pb::MessageParser<MethodOptions>(() => new MethodOptions());
private pb::UnknownFieldSet _unknownFields;
internal pb::ExtensionSet<MethodOptions> _extensions;
private pb::ExtensionSet<MethodOptions> _Extensions => _extensions;
private pb::ExtensionSet<MethodOptions> _Extensions { get { return _extensions; } }
private int _hasBits0;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pb::MessageParser<MethodOptions> Parser { get { return _parser; } }
Expand Down
7 changes: 3 additions & 4 deletions src/google/protobuf/compiler/csharp/csharp_message.cc
View file
Open in desktop
Expand Up @@ -150,10 +150,9 @@ void MessageGenerator::Generate(io::Printer* printer) {
printer->Print(vars, "private pb::ExtensionSet<$class_name$> _extensions;\n");
}

printer->Print(vars,
"private pb::ExtensionSet<$class_name$> _Extensions => "
"_extensions;\n"); // a read-only property for fast
// retrieval of the set in IsInitialized
// a read-only property for fast
// retrieval of the set in IsInitialized
printer->Print(vars, "private pb::ExtensionSet<$class_name$> _Extensions { get { return _extensions; } }\n");
}

for (int i = 0; i < has_bit_field_count_; i++) {
Expand Down