Fix custom options behaviour
diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
new file mode 100644
index 0000000..8441c1d
--- /dev/null
+++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
@@ -0,0 +1,246 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Google.ProtocolBuffers.TestProtos {
+
+ public static partial class UnitTestCSharpOptionsProtoFile {
+
+ #region Extension registration
+ public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+ }
+ #endregion
+ #region Static variables
+ internal static pbd::MessageDescriptor internal__static_protobuf_unittest_OptionsMessage__Descriptor;
+ internal static pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.TestProtos.OptionsMessage, global::Google.ProtocolBuffers.TestProtos.OptionsMessage.Builder> internal__static_protobuf_unittest_OptionsMessage__FieldAccessorTable;
+ #endregion
+ #region Descriptor
+ public static pbd::FileDescriptor Descriptor {
+ get { return descriptor; }
+ }
+ private static pbd::FileDescriptor descriptor;
+
+ static UnitTestCSharpOptionsProtoFile() {
+ byte[] descriptorData = global::System.Convert.FromBase64String(
+ "Ci1nb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfY3NoYXJwX29wdGlvbnMucHJv" +
+ "dG8SEXByb3RvYnVmX3VuaXR0ZXN0GiRnb29nbGUvcHJvdG9idWYvY3NoYXJw" +
+ "X29wdGlvbnMucHJvdG8iXgoOT3B0aW9uc01lc3NhZ2USDgoGbm9ybWFsGAEg" +
+ "ASgJEhcKD29wdGlvbnNfbWVzc2FnZRgCIAEoCRIjCgpjdXN0b21pemVkGAMg" +
+ "ASgJQg/CPgwKCkN1c3RvbU5hbWVCRsI+QwohR29vZ2xlLlByb3RvY29sQnVm" +
+ "ZmVycy5UZXN0UHJvdG9zEh5Vbml0VGVzdENTaGFycE9wdGlvbnNQcm90b0Zp" +
+ "bGU=");
+ pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+ descriptor = root;
+ internal__static_protobuf_unittest_OptionsMessage__Descriptor = Descriptor.MessageTypes[0];
+ internal__static_protobuf_unittest_OptionsMessage__FieldAccessorTable =
+ new pb::FieldAccess.FieldAccessorTable<global::Google.ProtocolBuffers.TestProtos.OptionsMessage, global::Google.ProtocolBuffers.TestProtos.OptionsMessage.Builder>(internal__static_protobuf_unittest_OptionsMessage__Descriptor,
+ new string[] { "Normal", "OptionsMessage_", "CustomName", });
+ pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance();
+ RegisterAllExtensions(registry);
+ global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.RegisterAllExtensions(registry);
+ return registry;
+ };
+ pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+ new pbd::FileDescriptor[] {
+ global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor,
+ }, assigner);
+ }
+ #endregion
+
+ }
+ #region Messages
+ public sealed partial class OptionsMessage : pb::GeneratedMessage<OptionsMessage, OptionsMessage.Builder> {
+ private static readonly OptionsMessage defaultInstance = new Builder().BuildPartial();
+ public static OptionsMessage DefaultInstance {
+ get { return defaultInstance; }
+ }
+
+ public override OptionsMessage DefaultInstanceForType {
+ get { return defaultInstance; }
+ }
+
+ protected override OptionsMessage ThisMessage {
+ get { return this; }
+ }
+
+ public static pbd::MessageDescriptor Descriptor {
+ get { return global::Google.ProtocolBuffers.TestProtos.UnitTestCSharpOptionsProtoFile.internal__static_protobuf_unittest_OptionsMessage__Descriptor; }
+ }
+
+ protected override pb::FieldAccess.FieldAccessorTable<OptionsMessage, OptionsMessage.Builder> InternalFieldAccessors {
+ get { return global::Google.ProtocolBuffers.TestProtos.UnitTestCSharpOptionsProtoFile.internal__static_protobuf_unittest_OptionsMessage__FieldAccessorTable; }
+ }
+
+ public const int NormalFieldNumber = 1;
+ private bool hasNormal;
+ private string normal_ = "";
+ public bool HasNormal {
+ get { return hasNormal; }
+ }
+ public string Normal {
+ get { return normal_; }
+ }
+
+ public const int OptionsMessage_FieldNumber = 2;
+ private bool hasOptionsMessage_;
+ private string optionsMessage_ = "";
+ public bool HasOptionsMessage_ {
+ get { return hasOptionsMessage_; }
+ }
+ public string OptionsMessage_ {
+ get { return optionsMessage_; }
+ }
+
+ public const int CustomNameFieldNumber = 3;
+ private bool hasCustomName;
+ private string customized_ = "";
+ public bool HasCustomName {
+ get { return hasCustomName; }
+ }
+ public string CustomName {
+ get { return customized_; }
+ }
+
+ public static OptionsMessage ParseFrom(pb::ByteString data) {
+ return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+ return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(byte[] data) {
+ return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+ return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(global::System.IO.Stream input) {
+ return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+ return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+ }
+ public static OptionsMessage ParseDelimitedFrom(global::System.IO.Stream input) {
+ return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+ }
+ public static OptionsMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+ return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(pb::CodedInputStream input) {
+ return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+ }
+ public static OptionsMessage ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+ return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+ }
+ public static Builder CreateBuilder() { return new Builder(); }
+ public override Builder ToBuilder() { return CreateBuilder(this); }
+ public override Builder CreateBuilderForType() { return new Builder(); }
+ public static Builder CreateBuilder(OptionsMessage prototype) {
+ return (Builder) new Builder().MergeFrom(prototype);
+ }
+
+ public sealed partial class Builder : pb::GeneratedBuilder<OptionsMessage, Builder> {
+ protected override Builder ThisBuilder {
+ get { return this; }
+ }
+ public Builder() {}
+
+ OptionsMessage result = new OptionsMessage();
+
+ protected override OptionsMessage MessageBeingBuilt {
+ get { return result; }
+ }
+
+ public override Builder Clear() {
+ result = new OptionsMessage();
+ return this;
+ }
+
+ public override Builder Clone() {
+ return new Builder().MergeFrom(result);
+ }
+
+ public override pbd::MessageDescriptor DescriptorForType {
+ get { return OptionsMessage.Descriptor; }
+ }
+
+ public override OptionsMessage DefaultInstanceForType {
+ get { return OptionsMessage.DefaultInstance; }
+ }
+
+ public override OptionsMessage BuildPartial() {
+ if (result == null) {
+ throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+ }
+ OptionsMessage returnMe = result;
+ result = null;
+ return returnMe;
+ }
+
+
+ public bool HasNormal {
+ get { return result.HasNormal; }
+ }
+ public string Normal {
+ get { return result.Normal; }
+ set { SetNormal(value); }
+ }
+ public Builder SetNormal(string value) {
+ pb::ThrowHelper.ThrowIfNull(value, "value");
+ result.hasNormal = true;
+ result.normal_ = value;
+ return this;
+ }
+ public Builder ClearNormal() {
+ result.hasNormal = false;
+ result.normal_ = "";
+ return this;
+ }
+
+ public bool HasOptionsMessage_ {
+ get { return result.HasOptionsMessage_; }
+ }
+ public string OptionsMessage_ {
+ get { return result.OptionsMessage_; }
+ set { SetOptionsMessage_(value); }
+ }
+ public Builder SetOptionsMessage_(string value) {
+ pb::ThrowHelper.ThrowIfNull(value, "value");
+ result.hasOptionsMessage_ = true;
+ result.optionsMessage_ = value;
+ return this;
+ }
+ public Builder ClearOptionsMessage_() {
+ result.hasOptionsMessage_ = false;
+ result.optionsMessage_ = "";
+ return this;
+ }
+
+ public bool HasCustomName {
+ get { return result.HasCustomName; }
+ }
+ public string CustomName {
+ get { return result.CustomName; }
+ set { SetCustomName(value); }
+ }
+ public Builder SetCustomName(string value) {
+ pb::ThrowHelper.ThrowIfNull(value, "value");
+ result.hasCustomName = true;
+ result.customized_ = value;
+ return this;
+ }
+ public Builder ClearCustomName() {
+ result.hasCustomName = false;
+ result.customized_ = "";
+ return this;
+ }
+ }
+ static OptionsMessage() {
+ pbd::FileDescriptor descriptor = global::Google.ProtocolBuffers.TestProtos.UnitTestCSharpOptionsProtoFile.Descriptor;
+ }
+ }
+
+ #endregion
+
+}